Changed TAO_Collocation_Table_Lock's implementation.

2 files changed, 30 insertions, 30 deletions

diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp
index bd157bc3a1c..bcfa54ac8b0 100644
--- a/TAO/tao/ORB_Core.cpp
+++ b/TAO/tao/ORB_Core.cpp
@@ -15,7 +15,7 @@
 typedef ACE_TSS_Singleton<TAO_ORB_Core, ACE_SYNCH_MUTEX>
         TAO_ORB_CORE;
 
-TAO_COLTBL_Lock::TAO_COLTBL_Lock (void)
+TAO_Collocation_Table_Lock::TAO_Collocation_Table_Lock (void)
 {
     this->lock_ =TAO_ORB_Core_instance ()->server_factory ()->create_coltbl_lock ();
   // We don't need to worry about the race condition here because this
@@ -23,7 +23,7 @@ TAO_COLTBL_Lock::TAO_COLTBL_Lock (void)
   // placed inside a ACE_Singleton.
 }
 
-TAO_COLTBL_Lock::~TAO_COLTBL_Lock (void)
+TAO_Collocation_Table_Lock::~TAO_Collocation_Table_Lock (void)
 {
   delete this->lock_;
   this->lock_ = 0;
@@ -848,7 +848,7 @@ TAO_ORB_Core::add_to_collocation_table (void)
 {
   if (this->using_collocation ())
     {
-      TAO_GLOBAL_COLTBL *coltbl = this->resource_factory ()->get_global_collocation_table ();
+      TAO_GLOBAL_Collocation_Table *coltbl = this->resource_factory ()->get_global_collocation_table ();
       if (coltbl != 0)
         return coltbl->bind (this->orb_params ()->addr (), this->root_poa ());
     }
@@ -860,7 +860,7 @@ TAO_ORB_Core::get_collocated_poa (ACE_INET_Addr &addr)
 {
   if (this->using_collocation ())
     {
-      TAO_GLOBAL_COLTBL *coltbl = this->resource_factory ()->get_global_collocation_table ();
+      TAO_GLOBAL_Collocation_Table *coltbl = this->resource_factory ()->get_global_collocation_table ();
       if (coltbl != 0)
         {
           TAO_POA *poa;
@@ -1112,10 +1112,10 @@ TAO_Resource_Factory::get_allocator (void)
   return 0;
 }
 
-TAO_GLOBAL_COLTBL *
+TAO_GLOBAL_Collocation_Table *
 TAO_Resource_Factory::get_global_collocation_table (void)
 {
-  return (coltbl_source_ == TAO_GLOBAL ? GLOBAL_COLTBL::instance () : 0);
+  return (coltbl_source_ == TAO_GLOBAL ? GLOBAL_Collocation_Table::instance () : 0);
 }
 
 // This function exists because of Win32's proclivity for expanding
@@ -1172,18 +1172,18 @@ template class ACE_TSS<TAO_Resource_Factory::Pre_Allocated>;
 template class ACE_Singleton<TAO_Resource_Factory::App_Allocated, ACE_SYNCH_MUTEX>;
 template class ACE_TSS_Singleton<TAO_Resource_Factory::App_Allocated, ACE_SYNCH_MUTEX>;
 template class ACE_TSS<TAO_Resource_Factory::App_Allocated>;
-template class ACE_Hash_Map_Manager<ACE_Hash_Addr<ACE_INET_Addr>, TAO_POA *, TAO_COLTBL_Lock>;
+template class ACE_Hash_Map_Manager<ACE_Hash_Addr<ACE_INET_Addr>, TAO_POA *, TAO_Collocation_Table_Lock>;
 template class ACE_Hash_Map_Entry<ACE_Hash_Addr<ACE_INET_Addr>, TAO_POA *>;
-template class ACE_Hash_Map_Iterator_Base<ACE_Hash_Addr<ACE_INET_Addr>, TAO_POA *, TAO_COLTBL_Lock>;
-template class ACE_Hash_Map_Iterator<ACE_Hash_Addr<ACE_INET_Addr>, TAO_POA *, TAO_COLTBL_Lock>;
-template class ACE_Hash_Map_Reverse_Iterator<ACE_Hash_Addr<ACE_INET_Addr>, TAO_POA *, TAO_COLTBL_Lock>;
-template class ACE_Guard<TAO_COLTBL_Lock>;
-template class ACE_Read_Guard<TAO_COLTBL_Lock>;
-template class ACE_Write_Guard<TAO_COLTBL_Lock>;
+template class ACE_Hash_Map_Iterator_Base<ACE_Hash_Addr<ACE_INET_Addr>, TAO_POA *, TAO_Collocation_Table_Lock>;
+template class ACE_Hash_Map_Iterator<ACE_Hash_Addr<ACE_INET_Addr>, TAO_POA *, TAO_Collocation_Table_Lock>;
+template class ACE_Hash_Map_Reverse_Iterator<ACE_Hash_Addr<ACE_INET_Addr>, TAO_POA *, TAO_Collocation_Table_Lock>;
+template class ACE_Guard<TAO_Collocation_Table_Lock>;
+template class ACE_Read_Guard<TAO_Collocation_Table_Lock>;
+template class ACE_Write_Guard<TAO_Collocation_Table_Lock>;
 template class ACE_Guard<ACE_SYNCH_MUTEX>;
 template class ACE_Read_Guard<ACE_SYNCH_MUTEX>;
 template class ACE_Write_Guard<ACE_SYNCH_MUTEX>;
-template class ACE_Singleton<TAO_GLOBAL_COLTBL, ACE_SYNCH_MUTEX>;
+template class ACE_Singleton<TAO_GLOBAL_Collocation_Table, ACE_SYNCH_MUTEX>;
 
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
 #pragma instantiate ACE_Env_Value<int>
@@ -1214,18 +1214,18 @@ template class ACE_Singleton<TAO_GLOBAL_COLTBL, ACE_SYNCH_MUTEX>;
 #pragma instantiate ACE_Singleton<TAO_Resource_Factory::App_Allocated, ACE_SYNCH_MUTEX>
 #pragma instantiate ACE_TSS_Singleton<TAO_Resource_Factory::App_Allocated, ACE_SYNCH_MUTEX>
 #pragma instantiate ACE_TSS<TAO_Resource_Factory::App_Allocated>
-#pragma instantiate ACE_Hash_Map_Manager<ACE_Hash_Addr<ACE_INET_Addr>, TAO_POA *, TAO_COLTBL_Lock>
+#pragma instantiate ACE_Hash_Map_Manager<ACE_Hash_Addr<ACE_INET_Addr>, TAO_POA *, TAO_Collocation_Table_Lock>
 #pragma instantiate ACE_Hash_Map_Entry<ACE_Hash_Addr<ACE_INET_Addr>, TAO_POA *>
-#pragma instantiate ACE_Hash_Map_Iterator_Base<ACE_Hash_Addr<ACE_INET_Addr>, TAO_POA *, TAO_COLTBL_Lock>
-#pragma instantiate ACE_Hash_Map_Iterator<ACE_Hash_Addr<ACE_INET_Addr>, TAO_POA *, TAO_COLTBL_Lock>
-#pragma instantiate ACE_Hash_Map_Reverse_Iterator<ACE_Hash_Addr<ACE_INET_Addr>, TAO_POA *, TAO_COLTBL_Lock>
-#pragma instantiate ACE_Guard<TAO_COLTBL_Lock>
-#pragma instantiate ACE_Read_Guard<TAO_COLTBL_Lock>
-#pragma instantiate ACE_Write_Guard<TAO_COLTBL_Lock>
+#pragma instantiate ACE_Hash_Map_Iterator_Base<ACE_Hash_Addr<ACE_INET_Addr>, TAO_POA *, TAO_Collocation_Table_Lock>
+#pragma instantiate ACE_Hash_Map_Iterator<ACE_Hash_Addr<ACE_INET_Addr>, TAO_POA *, TAO_Collocation_Table_Lock>
+#pragma instantiate ACE_Hash_Map_Reverse_Iterator<ACE_Hash_Addr<ACE_INET_Addr>, TAO_POA *, TAO_Collocation_Table_Lock>
+#pragma instantiate ACE_Guard<TAO_Collocation_Table_Lock>
+#pragma instantiate ACE_Read_Guard<TAO_Collocation_Table_Lock>
+#pragma instantiate ACE_Write_Guard<TAO_Collocation_Table_Lock>
 #pragma instantiate ACE_Guard<ACE_SYNCH_MUTEX>
 #pragma instantiate ACE_Read_Guard<ACE_SYNCH_MUTEX>
 #pragma instantiate ACE_Write_Guard<ACE_SYNCH_MUTEX>
-#pragma instantiate ACE_Singleton<TAO_GLOBAL_COLTBL, ACE_SYNCH_MUTEX>
+#pragma instantiate ACE_Singleton<TAO_GLOBAL_Collocation_Table, ACE_SYNCH_MUTEX>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
 
 ACE_FACTORY_DEFINE (TAO, TAO_Resource_Factory)
diff --git a/TAO/tao/ORB_Core.h b/TAO/tao/ORB_Core.h
index 2097f09b501..ca41d7391f2 100644
--- a/TAO/tao/ORB_Core.h
+++ b/TAO/tao/ORB_Core.h
@@ -34,18 +34,18 @@ typedef ACE_NOOP_Concurrency_Strategy<TAO_Client_Connection_Handler>
         TAO_NULL_ACTIVATION_STRATEGY;
 
 
-class TAO_COLTBL_Lock : public ACE_Adaptive_Lock
+class TAO_Collocation_Table_Lock : public ACE_Adaptive_Lock
 {
   // TITLE
   //   This lock class determines the type underlying lock
   //   when it gets constructed.
 public:
-  TAO_COLTBL_Lock (void);
-  ~TAO_COLTBL_Lock (void);
+  TAO_Collocation_Table_Lock (void);
+  ~TAO_Collocation_Table_Lock (void);
 };
 
-typedef ACE_Hash_Map_Manager<ACE_Hash_Addr<ACE_INET_Addr>, TAO_POA *, TAO_COLTBL_Lock>
-        TAO_GLOBAL_COLTBL;
+typedef ACE_Hash_Map_Manager<ACE_Hash_Addr<ACE_INET_Addr>, TAO_POA *, TAO_Collocation_Table_Lock>
+        TAO_GLOBAL_Collocation_Table;
 
 // Forward decl.
 class TAO_Resource_Factory;
@@ -353,7 +353,7 @@ public:
   // Return a pointer to an ACE_Allocator used for allocating memory
   // within the ORB.
 
-  TAO_GLOBAL_COLTBL *get_global_collocation_table (void);
+  TAO_GLOBAL_Collocation_Table *get_global_collocation_table (void);
   // Get the global collocation table.  Return the pointer to the
   // global collocation table if we are using one, otherwise, return
   // 0.
@@ -461,8 +461,8 @@ private:
           GLOBAL_APP_ALLOCATED;
   typedef ACE_TSS_Singleton<App_Allocated, ACE_SYNCH_MUTEX>
           TSS_APP_ALLOCATED;
-  typedef ACE_Singleton<TAO_GLOBAL_COLTBL, ACE_SYNCH_MUTEX>
-          GLOBAL_COLTBL;
+  typedef ACE_Singleton<TAO_GLOBAL_Collocation_Table, ACE_SYNCH_MUTEX>
+          GLOBAL_Collocation_Table;
 };
 
 #if defined (__ACE_INLINE__)