diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2005-11-04 12:30:28 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2005-11-04 12:30:28 +0000 |
| commit | c9c4aa68643a9bc0ca27d2ea121fb2a9eade7f2e (patch) | |
| tree | 86c5a57f3df7446e558bb3d0e016f3d9b5ecba34 | |
| parent | bb6f0b5a0d1c7a5f320fdd6e52f112be2fbc3dcf (diff) | |
| download | ATCD-c9c4aa68643a9bc0ca27d2ea121fb2a9eade7f2e.tar.gz | |
ChangeLogTag: Fri Nov 4 12:28:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | tests/Map_Test.cpp | 26 |
2 files changed, 18 insertions, 13 deletions
diff --git a/ChangeLog b/ChangeLog index 2762c1f6d0c..bd5a67105f2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Fri Nov 4 12:28:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl> + + * tests/Lazy_Map_Manager_Test.cpp: + Changed MAP to LAZY_MAP + Fri Nov 4 12:04:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl> * ace/Cache_Map_Manager_T.{h,cpp,inl}: diff --git a/tests/Map_Test.cpp b/tests/Map_Test.cpp index 9a8a634662f..8fb46dd983a 100644 --- a/tests/Map_Test.cpp +++ b/tests/Map_Test.cpp @@ -28,7 +28,7 @@ ACE_RCSID(tests, Map_Test, "$Id$") typedef size_t VALUE; // Generic map type. -typedef ACE_Map<KEY, VALUE> MAP; +typedef ACE_Map<KEY, VALUE> TEST_MAP; // Manager Manager adapter. typedef ACE_Map_Manager_Adapter<KEY, VALUE, Key_Generator> MAP_MANAGER_ADAPTER; @@ -40,7 +40,7 @@ typedef ACE_Hash_Map_Manager_Ex_Adapter<KEY, VALUE, Hash_Key, ACE_Equal_To<KEY>, typedef ACE_Active_Map_Manager_Adapter<KEY, VALUE, Key_Adapter> ACTIVE_MAP_MANAGER_ADAPTER; static void -functionality_test (MAP &map, +functionality_test (TEST_MAP &map, size_t iterations) { size_t counter; @@ -78,13 +78,13 @@ functionality_test (MAP &map, // Forward iteration... { counter = 0; - MAP::iterator end = map.end (); + TEST_MAP::iterator end = map.end (); - for (MAP::iterator iter = map.begin (); + for (TEST_MAP::iterator iter = map.begin (); iter != end; ++iter, ++counter) { - MAP::value_type entry = *iter; + TEST_MAP::value_type entry = *iter; // Recover original key. KEY original_key; @@ -116,14 +116,14 @@ functionality_test (MAP &map, // Reverse iteration... { counter = iterations; - MAP::reverse_iterator end = map.rend (); + TEST_MAP::reverse_iterator end = map.rend (); - for (MAP::reverse_iterator iter = map.rbegin (); + for (TEST_MAP::reverse_iterator iter = map.rbegin (); iter != end; ++iter) { --counter; - MAP::value_type entry = *iter; + TEST_MAP::value_type entry = *iter; // Recover original key. KEY original_key; @@ -175,7 +175,7 @@ functionality_test (MAP &map, } static void -insert_test (MAP &map, +insert_test (TEST_MAP &map, size_t iterations, KEY *keys) { @@ -190,7 +190,7 @@ insert_test (MAP &map, } static void -find_test (MAP &map, +find_test (TEST_MAP &map, size_t iterations, KEY *keys) { @@ -204,7 +204,7 @@ find_test (MAP &map, } static void -unbind_test (MAP &map, +unbind_test (TEST_MAP &map, size_t iterations, KEY *keys) { @@ -219,8 +219,8 @@ unbind_test (MAP &map, } static void -performance_test (void (*ptf) (MAP &, size_t, KEY *), - MAP &map, +performance_test (void (*ptf) (TEST_MAP &, size_t, KEY *), + TEST_MAP &map, size_t iterations, KEY *keys, size_t table_size, |