Added TAO_ to the typdefed names to avoid conflicts

4 files changed, 104 insertions, 104 deletions

diff --git a/TAO/tao/IIOP_Connector.cpp b/TAO/tao/IIOP_Connector.cpp
index 184ce41b425..b19d4b14a56 100644
--- a/TAO/tao/IIOP_Connector.cpp
+++ b/TAO/tao/IIOP_Connector.cpp
@@ -76,7 +76,7 @@ TAO_IIOP_Connector::open (TAO_ORB_Core *orb_core)
   auto_ptr<TAO_Cached_Connector_Lock> new_connector_lock (connector_lock);
 
   ACE_NEW_RETURN (this->cached_connect_strategy_,
-                  CACHED_CONNECT_STRATEGY (*this->caching_strategy_,
+                  TAO_CACHED_CONNECT_STRATEGY (*this->caching_strategy_,
                                            new_connect_creation_strategy.get (),
                                            0,
                                            0,
@@ -419,17 +419,17 @@ TAO_IIOP_Connector::purge_connections (void)
 
 #define TAO_HANDLER TAO_IIOP_Client_Connection_Handler
 #define TAO_SVC_TUPLE ACE_Svc_Tuple<TAO_HANDLER>
-#define TAO_ADDR TAO_IIOP_Connector::ADDR
-#define TAO_HASH_KEY TAO_IIOP_Connector::HASH_KEY
-#define TAO_COMPARE_KEYS TAO_IIOP_Connector::COMPARE_KEYS
-#define TAO_ATTRIBUTES TAO_IIOP_Connector::ATTRIBUTES
-#define TAO_CACHED_HANDLER TAO_IIOP_Connector::CACHED_HANDLER
-#define TAO_HASH_MAP TAO_IIOP_Connector::HASH_MAP
-#define TAO_HASH_MAP_ITERATOR TAO_IIOP_Connector::HASH_MAP_ITERATOR
-#define TAO_HASH_MAP_REVERSE_ITERATOR TAO_IIOP_Connector::HASH_MAP_REVERSE_ITERATOR
-#define TAO_CACHING_UTILITY TAO_IIOP_Connector::CACHING_UTILITY
-#define TAO_CACHING_STRATEGY TAO_IIOP_Connector::CACHING_STRATEGY
-#define TAO_CACHED_CONNECT_STRATEGY TAO_IIOP_Connector::CACHED_CONNECT_STRATEGY
+#define TAO_ADDR TAO_IIOP_Connector::TAO_IADDR
+#define TAO_HASH_KEY TAO_IIOP_Connector::TAO_HASH_KEY
+#define TAO_COMPARE_KEYS TAO_IIOP_Connector::TAO_COMPARE_KEYS
+#define TAO_ATTRIBUTES TAO_IIOP_Connector::TAO_ATTRIBUTES
+#define TAO_CACHED_HANDLER TAO_IIOP_Connector::TAO_CACHED_HANDLER
+#define TAO_HASH_MAP TAO_IIOP_Connector::TAO_HASH_MAP
+#define TAO_HASH_MAP_ITERATOR TAO_IIOP_Connector::TAO_HASH_MAP_ITERATOR
+#define TAO_HASH_MAP_REVERSE_ITERATOR TAO_IIOP_Connector::TAO_HASH_MAP_REVERSE_ITERATOR
+#define TAO_CACHING_UTILITY TAO_IIOP_Connector::TAO_CACHING_UTILITY
+#define TAO_CACHING_STRATEGY TAO_IIOP_Connector::TAO_CACHING_STRATEGY
+#define TAO_CACHED_CONNECT_STRATEGY TAO_IIOP_Connector::TAO_CACHED_CONNECT_STRATEGY
 
 typedef ACE_LRU_Caching_Strategy<TAO_ATTRIBUTES, TAO_CACHING_UTILITY>
         TAO_IIOP_LRU_CACHING_STRATEGY;
diff --git a/TAO/tao/IIOP_Connector.h b/TAO/tao/IIOP_Connector.h
index 9a07c79a576..434a1366f78 100644
--- a/TAO/tao/IIOP_Connector.h
+++ b/TAO/tao/IIOP_Connector.h
@@ -114,57 +114,57 @@ protected:
 public:
 
   // = Connection Caching Strategy.
-  typedef size_t ATTRIBUTES;
+  typedef size_t TAO_ATTRIBUTES;
   typedef ACE_Pair<TAO_IIOP_Client_Connection_Handler *,
-                   ATTRIBUTES>
-          CACHED_HANDLER;
+                   TAO_ATTRIBUTES>
+          TAO_CACHED_HANDLER;
   typedef ACE_Refcounted_Hash_Recyclable<ACE_INET_Addr>
-          ADDR;
-  typedef ACE_Hash<ADDR> HASH_KEY;
-  typedef ACE_Equal_To<ADDR> COMPARE_KEYS;
-
-  typedef ACE_Hash_Map_Manager_Ex<ADDR,
-                                  CACHED_HANDLER,
-                                  HASH_KEY,
-                                  COMPARE_KEYS,
+          TAO_IADDR;
+  typedef ACE_Hash<TAO_IADDR> TAO_HASH_KEY;
+  typedef ACE_Equal_To<TAO_IADDR> TAO_COMPARE_KEYS;
+
+  typedef ACE_Hash_Map_Manager_Ex<TAO_IADDR,
+                                  TAO_CACHED_HANDLER,
+                                  TAO_HASH_KEY,
+                                  TAO_COMPARE_KEYS,
                                   ACE_Null_Mutex>
-          HASH_MAP;
-  typedef ACE_Hash_Map_Iterator_Ex<ADDR,
-                                   CACHED_HANDLER,
-                                   HASH_KEY,
-                                   COMPARE_KEYS,
+          TAO_HASH_MAP;
+  typedef ACE_Hash_Map_Iterator_Ex<TAO_IADDR,
+                                   TAO_CACHED_HANDLER,
+                                   TAO_HASH_KEY,
+                                   TAO_COMPARE_KEYS,
                                    ACE_Null_Mutex>
-          HASH_MAP_ITERATOR;
-  typedef ACE_Hash_Map_Reverse_Iterator_Ex<ADDR,
-                                           CACHED_HANDLER,
-                                           HASH_KEY,
-                                           COMPARE_KEYS,
+          TAO_HASH_MAP_ITERATOR;
+  typedef ACE_Hash_Map_Reverse_Iterator_Ex<TAO_IADDR,
+                                           TAO_CACHED_HANDLER,
+                                           TAO_HASH_KEY,
+                                           TAO_COMPARE_KEYS,
                                            ACE_Null_Mutex>
-          HASH_MAP_REVERSE_ITERATOR;
+          TAO_HASH_MAP_REVERSE_ITERATOR;
 
-  typedef ACE_Refcounted_Recyclable_Handler_Caching_Utility<ADDR,
-                                                            CACHED_HANDLER,
-                                                            HASH_MAP,
-                                                            HASH_MAP_ITERATOR,
-                                                            ATTRIBUTES>
-          CACHING_UTILITY;
+  typedef ACE_Refcounted_Recyclable_Handler_Caching_Utility<TAO_IADDR,
+                                                            TAO_CACHED_HANDLER,
+                                                            TAO_HASH_MAP,
+                                                            TAO_HASH_MAP_ITERATOR,
+                                                            TAO_ATTRIBUTES>
+          TAO_CACHING_UTILITY;
 
 #if defined (ACE_HAS_BROKEN_EXTENDED_TEMPLATES)
-  typedef ACE_LRU_Caching_Strategy<ATTRIBUTES,
-                                   CACHING_UTILITY>
-          CACHING_STRATEGY;
+  typedef ACE_LRU_Caching_Strategy<TAO_ATTRIBUTES,
+                                   TAO_CACHING_UTILITY>
+          TAO_CACHING_STRATEGY;
 #else
-  typedef ACE_Caching_Strategy<ATTRIBUTES,
-                               CACHING_UTILITY>
-          CACHING_STRATEGY;
+  typedef ACE_Caching_Strategy<TAO_ATTRIBUTES,
+                               TAO_CACHING_UTILITY>
+          TAO_CACHING_STRATEGY;
 #endif /* ACE_HAS_BROKEN_EXTENDED_TEMPLATES */
 
   typedef ACE_Cached_Connect_Strategy_Ex<TAO_IIOP_Client_Connection_Handler,
                                          ACE_SOCK_CONNECTOR,
-                                         CACHING_STRATEGY,
-                                         ATTRIBUTES,
+                                         TAO_CACHING_STRATEGY,
+                                         TAO_ATTRIBUTES,
                                          TAO_Cached_Connector_Lock>
-          CACHED_CONNECT_STRATEGY;
+          TAO_CACHED_CONNECT_STRATEGY;
 
   typedef ACE_NOOP_Concurrency_Strategy<TAO_IIOP_Client_Connection_Handler>
         TAO_NULL_ACTIVATION_STRATEGY;
@@ -182,10 +182,10 @@ private:
   TAO_ORB_Core *orb_core_;
   // ORB Core.
 
-  CACHED_CONNECT_STRATEGY *cached_connect_strategy_;
+  TAO_CACHED_CONNECT_STRATEGY *cached_connect_strategy_;
   // Cached connect strategy.
 
-  CACHING_STRATEGY *caching_strategy_;
+  TAO_CACHING_STRATEGY *caching_strategy_;
   // Caching strategy which decides the order of removal of entries
   // from the connection cache.
 };
diff --git a/TAO/tao/UIOP_Connector.cpp b/TAO/tao/UIOP_Connector.cpp
index cd800517ce8..8f3b15c9d57 100644
--- a/TAO/tao/UIOP_Connector.cpp
+++ b/TAO/tao/UIOP_Connector.cpp
@@ -77,7 +77,7 @@ TAO_UIOP_Connector::open (TAO_ORB_Core *orb_core)
   auto_ptr<TAO_Cached_Connector_Lock> new_connector_lock (connector_lock);
 
   ACE_NEW_RETURN (this->cached_connect_strategy_,
-                  CACHED_CONNECT_STRATEGY (*this->caching_strategy_,
+                  TAO_CACHED_CONNECT_STRATEGY (*this->caching_strategy_,
                                            new_connect_creation_strategy.get (),
                                            0,
                                            0,
@@ -390,17 +390,17 @@ TAO_UIOP_Connector::purge_connections (void)
 
 #define TAO_HANDLER TAO_UIOP_Client_Connection_Handler
 #define TAO_SVC_TUPLE ACE_Svc_Tuple<TAO_HANDLER>
-#define TAO_ADDR TAO_UIOP_Connector::ADDR
-#define TAO_HASH_KEY TAO_UIOP_Connector::HASH_KEY
-#define TAO_COMPARE_KEYS TAO_UIOP_Connector::COMPARE_KEYS
-#define TAO_ATTRIBUTES TAO_UIOP_Connector::ATTRIBUTES
-#define TAO_CACHED_HANDLER TAO_UIOP_Connector::CACHED_HANDLER
-#define TAO_HASH_MAP TAO_UIOP_Connector::HASH_MAP
-#define TAO_HASH_MAP_ITERATOR TAO_UIOP_Connector::HASH_MAP_ITERATOR
-#define TAO_HASH_MAP_REVERSE_ITERATOR TAO_UIOP_Connector::HASH_MAP_REVERSE_ITERATOR
-#define TAO_CACHING_UTILITY TAO_UIOP_Connector::CACHING_UTILITY
-#define TAO_CACHING_STRATEGY TAO_UIOP_Connector::CACHING_STRATEGY
-#define TAO_CACHED_CONNECT_STRATEGY TAO_UIOP_Connector::CACHED_CONNECT_STRATEGY
+#define TAO_ADDR TAO_UIOP_Connector::TAO_IADDR
+#define TAO_HASH_KEY TAO_UIOP_Connector::TAO_HASH_KEY
+#define TAO_COMPARE_KEYS TAO_UIOP_Connector::TAO_COMPARE_KEYS
+#define TAO_ATTRIBUTES TAO_UIOP_Connector::TAO_ATTRIBUTES
+#define TAO_CACHED_HANDLER TAO_UIOP_Connector::TAO_CACHED_HANDLER
+#define TAO_HASH_MAP TAO_UIOP_Connector::TAO_HASH_MAP
+#define TAO_HASH_MAP_ITERATOR TAO_UIOP_Connector::TAO_HASH_MAP_ITERATOR
+#define TAO_HASH_MAP_REVERSE_ITERATOR TAO_UIOP_Connector::TAO_HASH_MAP_REVERSE_ITERATOR
+#define TAO_CACHING_UTILITY TAO_UIOP_Connector::TAO_CACHING_UTILITY
+#define TAO_CACHING_STRATEGY TAO_UIOP_Connector::TAO_CACHING_STRATEGY
+#define TAO_CACHED_CONNECT_STRATEGY TAO_UIOP_Connector::TAO_CACHED_CONNECT_STRATEGY
 
 typedef ACE_LRU_Caching_Strategy<TAO_ATTRIBUTES, TAO_CACHING_UTILITY>
         TAO_UIOP_LRU_CACHING_STRATEGY;
diff --git a/TAO/tao/UIOP_Connector.h b/TAO/tao/UIOP_Connector.h
index 73e8260ec07..dab8603158a 100644
--- a/TAO/tao/UIOP_Connector.h
+++ b/TAO/tao/UIOP_Connector.h
@@ -116,63 +116,63 @@ protected:
 public:
 
   // = Connection Caching Strategy.
-  typedef size_t ATTRIBUTES;
+  typedef size_t TAO_ATTRIBUTES;
   typedef ACE_Pair<TAO_UIOP_Client_Connection_Handler *,
-                   ATTRIBUTES>
-          CACHED_HANDLER;
+                   TAO_ATTRIBUTES>
+          TAO_CACHED_HANDLER;
   typedef ACE_Refcounted_Hash_Recyclable<ACE_UNIX_Addr>
-          ADDR;
-  typedef ACE_Hash<ADDR> HASH_KEY;
-  typedef ACE_Equal_To<ADDR> COMPARE_KEYS;
-
-  typedef ACE_Hash_Map_Manager_Ex<ADDR,
-                                  CACHED_HANDLER,
-                                  HASH_KEY,
-                                  COMPARE_KEYS,
+          TAO_IADDR;
+  typedef ACE_Hash<TAO_IADDR> TAO_HASH_KEY;
+  typedef ACE_Equal_To<TAO_IADDR> TAO_COMPARE_KEYS;
+
+  typedef ACE_Hash_Map_Manager_Ex<TAO_IADDR,
+                                  TAO_CACHED_HANDLER,
+                                  TAO_HASH_KEY,
+                                  TAO_COMPARE_KEYS,
                                   ACE_Null_Mutex>
-          HASH_MAP;
-  typedef ACE_Hash_Map_Iterator_Ex<ADDR,
-                                   CACHED_HANDLER,
-                                   HASH_KEY,
-                                   COMPARE_KEYS,
+          TAO_HASH_MAP;
+  typedef ACE_Hash_Map_Iterator_Ex<TAO_IADDR,
+                                   TAO_CACHED_HANDLER,
+                                   TAO_HASH_KEY,
+                                   TAO_COMPARE_KEYS,
                                    ACE_Null_Mutex>
-          HASH_MAP_ITERATOR;
-  typedef ACE_Hash_Map_Reverse_Iterator_Ex<ADDR,
-                                           CACHED_HANDLER,
-                                           HASH_KEY,
-                                           COMPARE_KEYS,
+          TAO_HASH_MAP_ITERATOR;
+  typedef ACE_Hash_Map_Reverse_Iterator_Ex<TAO_IADDR,
+                                           TAO_CACHED_HANDLER,
+                                           TAO_HASH_KEY,
+                                           TAO_COMPARE_KEYS,
                                            ACE_Null_Mutex>
-          HASH_MAP_REVERSE_ITERATOR;
+          TAO_HASH_MAP_REVERSE_ITERATOR;
 
-  typedef ACE_Refcounted_Recyclable_Handler_Caching_Utility<ADDR,
-                                                 CACHED_HANDLER,
-                                                 HASH_MAP,
-                                                 HASH_MAP_ITERATOR,
-                                                 ATTRIBUTES>
-          CACHING_UTILITY;
+  typedef ACE_Refcounted_Recyclable_Handler_Caching_Utility<TAO_IADDR,
+                                                            TAO_CACHED_HANDLER,
+                                                            TAO_HASH_MAP,
+                                                            TAO_HASH_MAP_ITERATOR,
+                                                            TAO_ATTRIBUTES>
+          TAO_CACHING_UTILITY;
 
 #if defined (ACE_HAS_BROKEN_EXTENDED_TEMPLATES)
-  typedef ACE_LRU_Caching_Strategy<ATTRIBUTES,
-                                   CACHING_UTILITY>
-          CACHING_STRATEGY;
+  typedef ACE_LRU_Caching_Strategy<TAO_ATTRIBUTES,
+                                   TAO_CACHING_UTILITY>
+          TAO_CACHING_STRATEGY;
 #else
-  typedef ACE_Caching_Strategy<ATTRIBUTES,
-                               CACHING_UTILITY>
-          CACHING_STRATEGY;
+  typedef ACE_Caching_Strategy<TAO_ATTRIBUTES,
+                               TAO_CACHING_UTILITY>
+          TAO_CACHING_STRATEGY;
 #endif /* ACE_HAS_BROKEN_EXTENDED_TEMPLATES */
 
   typedef ACE_Cached_Connect_Strategy_Ex<TAO_UIOP_Client_Connection_Handler,
                                          ACE_LSOCK_CONNECTOR,
-                                         CACHING_STRATEGY,
-                                         ATTRIBUTES,
+                                         TAO_CACHING_STRATEGY,
+                                         TAO_ATTRIBUTES,
                                          TAO_Cached_Connector_Lock>
-          CACHED_CONNECT_STRATEGY;
+          TAO_CACHED_CONNECT_STRATEGY;
 
   typedef ACE_NOOP_Creation_Strategy<TAO_UIOP_Client_Connection_Handler>
-        TAO_NULL_CREATION_STRATEGY;
+          TAO_NULL_CREATION_STRATEGY;
 
   typedef ACE_NOOP_Concurrency_Strategy<TAO_UIOP_Client_Connection_Handler>
-        TAO_NULL_ACTIVATION_STRATEGY;
+          TAO_NULL_ACTIVATION_STRATEGY;
 
 private:
   TAO_NULL_CREATION_STRATEGY null_creation_strategy_;
@@ -184,10 +184,10 @@ private:
   TAO_ORB_Core *orb_core_;
   // ORB Core.
 
-  CACHED_CONNECT_STRATEGY *cached_connect_strategy_;
+  TAO_CACHED_CONNECT_STRATEGY *cached_connect_strategy_;
   // Cached connect strategy.
 
-  CACHING_STRATEGY *caching_strategy_;
+  TAO_CACHING_STRATEGY *caching_strategy_;
   // Caching strategy which decides the order of removal of entries
   // from the connection cache.
 };