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.

1 files changed, 12 insertions, 13 deletions

diff --git a/ACE/ace/Cached_Connect_Strategy_T.cpp b/ACE/ace/Cached_Connect_Strategy_T.cpp
index cdf68980ad3..05338be2c31 100644
--- a/ACE/ace/Cached_Connect_Strategy_T.cpp
+++ b/ACE/ace/Cached_Connect_Strategy_T.cpp
@@ -14,7 +14,6 @@
 #include "ace/Service_Types.h"
 #include "ace/Thread_Manager.h"
 #include "ace/WFMO_Reactor.h"
-#include "ace/Pair_T.h"
 
 #define ACE_T1 class SVC_HANDLER, ACE_PEER_CONNECTOR_1, class CACHING_STRATEGY, class ATTRIBUTES, class MUTEX
 #define ACE_T2 SVC_HANDLER, ACE_PEER_CONNECTOR_2, CACHING_STRATEGY, ATTRIBUTES, MUTEX
@@ -54,7 +53,7 @@ ACE_Cached_Connect_Strategy_Ex<ACE_T2>::check_hint_i
  bool reuse_addr,
  int flags,
  int perms,
- ACE_Hash_Map_Entry<ACE_Refcounted_Hash_Recyclable<ACE_PEER_CONNECTOR_ADDR>, ACE_Pair<SVC_HANDLER *, ATTRIBUTES> > *&entry,
+ ACE_Hash_Map_Entry<ACE_Refcounted_Hash_Recyclable<ACE_PEER_CONNECTOR_ADDR>, std::pair<SVC_HANDLER *, ATTRIBUTES> > *&entry,
  int &found)
 {
   ACE_UNUSED_ARG (remote_addr);
@@ -77,8 +76,8 @@ ACE_Cached_Connect_Strategy_Ex<ACE_T2>::check_hint_i
       if (possible_entry->ext_id_.decrement () == 0)
         {
           // If refcount goes to zero, close down the svc_handler
-          possible_entry->int_id_.first ()->recycler (0, 0);
-          possible_entry->int_id_.first ()->close ();
+          possible_entry->int_id_.first->recycler (0, 0);
+          possible_entry->int_id_.first->close ();
           this->purge_i (possible_entry);
         }
 
@@ -111,7 +110,7 @@ ACE_Cached_Connect_Strategy_Ex<ACE_T2>::check_hint_i
       int find_result = 0;
 
       int result = this->caching_strategy ().notify_find (find_result,
-                                                          possible_entry->int_id_.second ());
+                                                          possible_entry->int_id_.second);
 
       if (result == -1)
         return result;
@@ -144,7 +143,7 @@ ACE_Cached_Connect_Strategy_Ex<ACE_T2>::find_or_create_svc_handler_i
  bool reuse_addr,
  int flags,
  int perms,
- ACE_Hash_Map_Entry<ACE_Refcounted_Hash_Recyclable<ACE_PEER_CONNECTOR_ADDR>, ACE_Pair<SVC_HANDLER *, ATTRIBUTES> > *&entry,
+ ACE_Hash_Map_Entry<ACE_Refcounted_Hash_Recyclable<ACE_PEER_CONNECTOR_ADDR>, std::pair<SVC_HANDLER *, ATTRIBUTES> > *&entry,
  int &found)
 {
   REFCOUNTED_HASH_RECYCLABLE_ADDRESS search_addr (remote_addr);
@@ -155,7 +154,7 @@ ACE_Cached_Connect_Strategy_Ex<ACE_T2>::find_or_create_svc_handler_i
   {
     // We found a cached svc_handler.
     // Get the cached <svc_handler>
-    sh = entry->int_id_.first ();
+    sh = entry->int_id_.first;
 
     // Is the connection clean?
     int state_result =
@@ -450,8 +449,8 @@ ACE_Cached_Connect_Strategy_Ex<ACE_T2>::cleanup_hint_i (const void *recycling_ac
   if (entry->ext_id_.recycle_state () == ACE_RECYCLABLE_CLOSED &&
       refcount == 0)
     {
-      entry->int_id_.first ()->recycler (0, 0);
-      entry->int_id_.first ()->close ();
+      entry->int_id_.first->recycler (0, 0);
+      entry->int_id_.first->close ();
       this->purge_i (entry);
     }
 
@@ -472,10 +471,10 @@ ACE_Cached_Connect_Strategy_Ex<ACE_T2>::caching_strategy (void)
 
 template <ACE_T1> int
 ACE_Cached_Connect_Strategy_Ex<ACE_T2>::find (ACE_Refcounted_Hash_Recyclable<ACE_PEER_CONNECTOR_ADDR> &search_addr,
-                                              ACE_Hash_Map_Entry<ACE_Refcounted_Hash_Recyclable<ACE_PEER_CONNECTOR_ADDR>, ACE_Pair<SVC_HANDLER *, ATTRIBUTES> > *&entry)
+                                              ACE_Hash_Map_Entry<ACE_Refcounted_Hash_Recyclable<ACE_PEER_CONNECTOR_ADDR>, std::pair<SVC_HANDLER *, ATTRIBUTES> > *&entry)
 {
   typedef ACE_Hash_Map_Bucket_Iterator<REFCOUNTED_HASH_RECYCLABLE_ADDRESS,
-                                       ACE_Pair<SVC_HANDLER *, ATTRIBUTES>,
+                                       std::pair<SVC_HANDLER *, ATTRIBUTES>,
                                        ACE_Hash<REFCOUNTED_HASH_RECYCLABLE_ADDRESS>,
                                        ACE_Equal_To<REFCOUNTED_HASH_RECYCLABLE_ADDRESS>,
                                        ACE_Null_Mutex>
@@ -512,7 +511,7 @@ ACE_Cached_Connect_Strategy_Ex<ACE_T2>::find (ACE_Refcounted_Hash_Recyclable<ACE
       int find_result = 0;
 
       int result = this->caching_strategy ().notify_find (find_result,
-                                                          entry->int_id_.second ());
+                                                          entry->int_id_.second);
 
       if (result == -1)
         return result;
@@ -591,7 +590,7 @@ ACE_Bounded_Cached_Connect_Strategy<ACE_T2>::find_or_create_svc_handler_i
  int flags,
  int perms,
  ACE_Hash_Map_Entry<ACE_Refcounted_Hash_Recyclable<ACE_PEER_CONNECTOR_ADDR>,
- ACE_Pair<SVC_HANDLER *, ATTRIBUTES> > *&entry,
+ std::pair<SVC_HANDLER *, ATTRIBUTES> > *&entry,
  int &found)
 {