summaryrefslogtreecommitdiff
path: root/ACE/tests/Map_Manager_Test.cpp
diff options
context:
space:
mode:
authormsmit <msmit@remedy.nl>2010-09-30 05:41:49 +0000
committermsmit <msmit@remedy.nl>2010-09-30 05:41:49 +0000
commit6cfcb7fc64b7b9c0ef1b8ea20bd6b8980d60e9e6 (patch)
treefc750d28062f2d554ae5875b9c190f1620db28b0 /ACE/tests/Map_Manager_Test.cpp
parent07d530a56a2770caaaf947b6d121a3bd71c1d0bd (diff)
downloadATCD-6cfcb7fc64b7b9c0ef1b8ea20bd6b8980d60e9e6.tar.gz
Thu Sep 30 05:45:10 UTC 2010 Marcel Smit <msmit@remedy.nl>
* NEWS: * ace/Cache_Map_Manager_T.h: * ace/Cache_Map_Manager_T.inl: * ace/Cache_Map_Manager_T.cpp: * ace/Cached_Connect_Strategy_T.h: * ace/Cached_Connect_Strategy_T.cpp: * ace/Caching_Strategies_T.h: * ace/Caching_Utility_T.cpp: * ace/Cleanup_Strategies_T.cpp: * ace/Hash_Cache_Map_Manager_T.h: * ace/Hash_Cache_Map_Manager_T.cpp: * ace/Map_T.h: * ace/Map_T.inl: * ace/Map_T.cpp: * ace/Pair_T.h: * ace/Pair_T.inl: * examples/Web_Crawler/URL_Visitor.h: * tests/Cache_Map_Manager_Test.cpp: * tests/Cached_Accept_Conn_Test.h: * tests/Cached_Conn_Test.cpp: * tests/Map_Manager_Test.cpp: Removed ACE_Pair from the ACE library.
Diffstat (limited to 'ACE/tests/Map_Manager_Test.cpp')
-rw-r--r--ACE/tests/Map_Manager_Test.cpp9
1 files changed, 3 insertions, 6 deletions
diff --git a/ACE/tests/Map_Manager_Test.cpp b/ACE/tests/Map_Manager_Test.cpp
index fbdfdf11f8c..7279c9f5d39 100644
--- a/ACE/tests/Map_Manager_Test.cpp
+++ b/ACE/tests/Map_Manager_Test.cpp
@@ -27,9 +27,6 @@
#include "ace/Profile_Timer.h"
#include "ace/Hash_Cache_Map_Manager_T.h"
#include "ace/Caching_Strategies_T.h"
-#include "ace/Pair_T.h"
-
-
typedef ACE_Null_Mutex MUTEX;
typedef ACE_UINT32 TYPE;
@@ -59,11 +56,11 @@ typedef ACE_Hash_Map_Entry <TYPE, TYPE>
typedef ACE_Active_Map_Manager <TYPE>
ACTIVE_MAP_MANAGER;
-typedef ACE_Hash_Map_Manager_Ex<TYPE, ACE_Pair<TYPE, int>, HASH_KEY, COMPARE_KEYS, MUTEX>
+typedef ACE_Hash_Map_Manager_Ex<TYPE, std::pair<TYPE, int>, HASH_KEY, COMPARE_KEYS, MUTEX>
CACHE_MAP_IMPL;
-typedef ACE_Hash_Map_Iterator_Ex<TYPE, ACE_Pair<TYPE, int>, HASH_KEY, COMPARE_KEYS, MUTEX>
+typedef ACE_Hash_Map_Iterator_Ex<TYPE, std::pair<TYPE, int>, HASH_KEY, COMPARE_KEYS, MUTEX>
CACHE_ITER_IMPL;
-typedef ACE_Hash_Map_Reverse_Iterator_Ex<TYPE, ACE_Pair<TYPE, int>, HASH_KEY, COMPARE_KEYS, MUTEX>
+typedef ACE_Hash_Map_Reverse_Iterator_Ex<TYPE, std::pair<TYPE, int>, HASH_KEY, COMPARE_KEYS, MUTEX>
CACHE_REV_ITER_IMPL;
typedef int ATTR;
typedef ACE_Null_Cleanup_Strategy<TYPE, TYPE, CACHE_MAP_IMPL>