diff options
| author | msmit <msmit@remedy.nl> | 2010-09-30 05:41:49 +0000 |
|---|---|---|
| committer | msmit <msmit@remedy.nl> | 2010-09-30 05:41:49 +0000 |
| commit | 6cfcb7fc64b7b9c0ef1b8ea20bd6b8980d60e9e6 (patch) | |
| tree | fc750d28062f2d554ae5875b9c190f1620db28b0 /ACE/ace/Map_T.h | |
| parent | 07d530a56a2770caaaf947b6d121a3bd71c1d0bd (diff) | |
| download | ATCD-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/ace/Map_T.h')
| -rw-r--r-- | ACE/ace/Map_T.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ACE/ace/Map_T.h b/ACE/ace/Map_T.h index a552e0f6d48..e8b97bf09a0 100644 --- a/ACE/ace/Map_T.h +++ b/ACE/ace/Map_T.h @@ -14,10 +14,10 @@ #define ACE_MAP_T_H #include /**/ "ace/pre.h" -#include "ace/Pair_T.h" #include "ace/Map_Manager.h" #include "ace/Hash_Map_Manager_T.h" #include "ace/Active_Map_Manager.h" +#include "ace/Pair_T.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -830,7 +830,7 @@ class ACE_Active_Map_Manager_Adapter : public ACE_Map<KEY, VALUE> public: // = Traits. - typedef ACE_Pair<KEY, VALUE> + typedef std::pair<KEY, VALUE> expanded_value; typedef ACE_Active_Map_Manager_Iterator_Adapter<ACE_Reference_Pair<const KEY, VALUE>, expanded_value> iterator_impl; @@ -983,7 +983,7 @@ public: virtual void dump (void) const; /// Accessor to implementation object. - ACE_Active_Map_Manager<ACE_Pair<KEY, VALUE> > &impl (void); + ACE_Active_Map_Manager<std::pair<KEY, VALUE> > &impl (void); /// Accessor to key adapter. KEY_ADAPTER &key_adapter (void); @@ -999,7 +999,7 @@ protected: expanded_value *&internal_value); /// All implementation details are forwarded to this class. - ACE_Active_Map_Manager<ACE_Pair<KEY, VALUE> > implementation_; + ACE_Active_Map_Manager<std::pair<KEY, VALUE> > implementation_; /// Adapts between the user key and the Active_Map_Manager_Key. KEY_ADAPTER key_adapter_; |