Index: delete_test1.cpp =================================================================== RCS file: /home/pooma/Repository/r2/src/Utilities/tests/delete_test1.cpp,v retrieving revision 1.7 diff -c -p -r1.7 delete_test1.cpp *** delete_test1.cpp 2001/03/21 00:56:09 1.7 --- delete_test1.cpp 2001/05/25 20:20:55 *************** int main(int argc, char *argv[]) *** 94,100 **** typedef std::vector KillList_t; ! typedef std::vector Array_t; void delete_shiftup_orig (Array_t &data, const KillList_t &killList); void delete_shiftup_test1(Array_t &data, const KillList_t &killList); --- 94,100 ---- typedef std::vector KillList_t; ! typedef std::vector Array_t; void delete_shiftup_orig (Array_t &data, const KillList_t &killList); void delete_shiftup_test1(Array_t &data, const KillList_t &killList); *************** void delete_shiftup_test2(Array_t &data, *** 618,635 **** if (inext < killed) copy_end_index = killList[inext]; ! const int length = copy_end_index - copy_begin_index; ! ! if (length < 100) ! std::copy(data_begin + copy_begin_index, ! data_begin + copy_end_index, ! data_begin + insert_index); ! else ! std::memmove(data_begin + insert_index, ! data_begin + copy_begin_index, ! sizeof(Array_t::value_type)*length); ! ! insert_index += length; } } --- 618,627 ---- if (inext < killed) copy_end_index = killList[inext]; ! std::copy(data_begin + copy_begin_index, ! data_begin + copy_end_index, ! data_begin + insert_index); ! insert_index += copy_end_index - copy_begin_index; } }