Sun Dec 2 16:10:32 UTC 2007 Abdullah Sowayan <abdullah.sowayan@lmco.com>

10 files changed, 32 insertions, 15 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 4e738650242..ece48a99bec 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,19 @@
+Sun Dec  2 16:10:32 UTC 2007  Abdullah Sowayan  <abdullah.sowayan@lmco.com>
+
+        * tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.h:
+        * tao/CSD_ThreadPool/CSD_TP_Request.h:
+        * tao/CSD_ThreadPool/CSD_TP_Servant_State.h:
+        * tao/CSD_ThreadPool/CSD_TP_Servant_State_Map.h:
+        * tao/CSD_ThreadPool/CSD_TP_Synch_Helper.h:
+        * tao/MMAP_Allocator.h:
+        * tao/Messaging/AMH_Response_Handler.h:
+        * tao/RTCORBA/Thread_Pool.h:
+        * tao/RTCORBA/Thread_Pool.cpp:
+
+          Parts of TAO use TAO_SYNCH_MUTEX while other parts use ACE_SYNCH_MUTEX.
+          All occurrences of ACE_SYNCH_MUTEX were replaced with TAO_SYNCH_MUTEX for
+          consistency.
+
 Sat Dec  1 17:41:00 UTC 2007  Abdullah Sowayan  <abdullah.sowayan@lmco.com>
 
         * tao/orbconf.h:
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.h
index e3b85853f9f..9aa378290ac 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.h
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Custom_Request_Operation.h
@@ -51,7 +51,7 @@ namespace TAO
      * TBD - Add description
      */
     class TAO_CSD_TP_Export TP_Custom_Request_Operation
-                      : public TAO_Intrusive_Ref_Count_Base<ACE_SYNCH_MUTEX>
+                      : public TAO_Intrusive_Ref_Count_Base<TAO_SYNCH_MUTEX>
     {
     public:
 
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Request.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Request.h
index 104d741d3b9..38af35b0a2a 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Request.h
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Request.h
@@ -49,7 +49,7 @@ namespace TAO
      * object.
      */
     class TAO_CSD_TP_Export TP_Request 
-      : public TAO_Intrusive_Ref_Count_Base<ACE_SYNCH_MUTEX>
+      : public TAO_Intrusive_Ref_Count_Base<TAO_SYNCH_MUTEX>
     {
     public:
 
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State.h
index dbfebedb64c..4f9a544d6cd 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State.h
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State.h
@@ -16,6 +16,7 @@
 #include /**/ "ace/pre.h"
 
 #include "tao/CSD_ThreadPool/CSD_TP_Export.h"
+#include "tao/orbconf.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -53,7 +54,7 @@ namespace TAO
      *
      */
     class TAO_CSD_TP_Export TP_Servant_State
-                      : public TAO_Intrusive_Ref_Count_Base<ACE_SYNCH_MUTEX>
+                      : public TAO_Intrusive_Ref_Count_Base<TAO_SYNCH_MUTEX>
     {
     public:
 
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State_Map.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State_Map.h
index ccbec859ea4..6dba5ec2376 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State_Map.h
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Servant_State_Map.h
@@ -75,7 +75,7 @@ namespace TAO
                                       TP_Servant_State::HandleType,
                                       ACE_Hash<void*>,
                                       ACE_Equal_To<void*>,
-                                      ACE_SYNCH_MUTEX>            MapType;
+                                      TAO_SYNCH_MUTEX>            MapType;
 
       /// The underlying map of servant state objects.
       MapType map_;
diff --git a/TAO/tao/CSD_ThreadPool/CSD_TP_Synch_Helper.h b/TAO/tao/CSD_ThreadPool/CSD_TP_Synch_Helper.h
index 2056f1ab032..cef6fe53ec0 100644
--- a/TAO/tao/CSD_ThreadPool/CSD_TP_Synch_Helper.h
+++ b/TAO/tao/CSD_ThreadPool/CSD_TP_Synch_Helper.h
@@ -77,7 +77,7 @@ namespace TAO
       };
 
       /// Thread lock type
-      typedef ACE_SYNCH_MUTEX LockType;
+      typedef TAO_SYNCH_MUTEX LockType;
 
       /// Thread guard type
       typedef ACE_Guard<LockType> GuardType;
diff --git a/TAO/tao/MMAP_Allocator.h b/TAO/tao/MMAP_Allocator.h
index 08f3295ecfd..083ad54382d 100644
--- a/TAO/tao/MMAP_Allocator.h
+++ b/TAO/tao/MMAP_Allocator.h
@@ -33,7 +33,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 // An ACE_Lite_MMAP_Memory_Pool is used since sync()ing is not
 // needed.  All memory allocated by the TAO_MMAP_Allocator is meant
 // for strictly transient data, not persistent.
-typedef ACE_Allocator_Adapter <ACE_Malloc<ACE_LITE_MMAP_MEMORY_POOL, ACE_SYNCH_MUTEX> > TAO_MMAP_Allocator_Base;
+typedef ACE_Allocator_Adapter <ACE_Malloc<ACE_LITE_MMAP_MEMORY_POOL, TAO_SYNCH_MUTEX> > TAO_MMAP_Allocator_Base;
 
 /**
  * @class TAO_MMAP_Allocator
diff --git a/TAO/tao/Messaging/AMH_Response_Handler.h b/TAO/tao/Messaging/AMH_Response_Handler.h
index 9d36b060143..74b4d136156 100644
--- a/TAO/tao/Messaging/AMH_Response_Handler.h
+++ b/TAO/tao/Messaging/AMH_Response_Handler.h
@@ -183,7 +183,7 @@ private:
   //    The lighter-weight form (using a state variable
 
   /// Mutex to ensure the AMH-RH method call is thread-safe.
-  ACE_SYNCH_MUTEX mutex_;
+  TAO_SYNCH_MUTEX mutex_;
 
   /// Allocator used to allocate this object. If zero then we are allocated
   /// from the heap
diff --git a/TAO/tao/RTCORBA/Thread_Pool.cpp b/TAO/tao/RTCORBA/Thread_Pool.cpp
index 6622e014bad..65c5b69df11 100644
--- a/TAO/tao/RTCORBA/Thread_Pool.cpp
+++ b/TAO/tao/RTCORBA/Thread_Pool.cpp
@@ -166,7 +166,7 @@ TAO_Thread_Lane::new_dynamic_thread (void)
   if (this->dynamic_threads_.thr_count () >= this->dynamic_threads_number_)
     return false;
 
-  ACE_GUARD_RETURN (ACE_SYNCH_MUTEX,
+  ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
                     mon,
                     this->lock_,
                     false);
@@ -209,7 +209,7 @@ TAO_Thread_Lane::new_dynamic_thread (void)
 void
 TAO_Thread_Lane::shutting_down (void)
 {
-  ACE_GUARD (ACE_SYNCH_MUTEX,
+  ACE_GUARD (TAO_SYNCH_MUTEX,
              mon,
              this->lock_);
 
@@ -350,7 +350,7 @@ TAO_Thread_Lane::is_collocated (const TAO_MProfile &mprofile)
 CORBA::ULong
 TAO_Thread_Lane::current_threads (void) const
 {
-  ACE_GUARD_RETURN (ACE_SYNCH_MUTEX,
+  ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
                     mon,
                     this->lock_,
                     0);
@@ -363,7 +363,7 @@ TAO_Thread_Lane::current_threads (void) const
 int
 TAO_Thread_Lane::create_static_threads (void)
 {
-  ACE_GUARD_RETURN (ACE_SYNCH_MUTEX,
+  ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
                     mon,
                     this->lock_,
                     0);
@@ -377,7 +377,7 @@ TAO_Thread_Lane::create_static_threads (void)
 int
 TAO_Thread_Lane::create_dynamic_threads (CORBA::ULong number_of_threads)
 {
-  ACE_GUARD_RETURN (ACE_SYNCH_MUTEX,
+  ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
                     mon,
                     this->lock_,
                     0);
@@ -628,7 +628,7 @@ TAO_Thread_Pool::create_static_threads (void)
 
 #define TAO_THREAD_POOL_MANAGER_GUARD \
   ACE_GUARD_THROW_EX ( \
-    ACE_SYNCH_MUTEX, \
+    TAO_SYNCH_MUTEX, \
     mon, \
     this->lock_, \
     CORBA::INTERNAL ( \
diff --git a/TAO/tao/RTCORBA/Thread_Pool.h b/TAO/tao/RTCORBA/Thread_Pool.h
index 9dc31bdcc4b..47143cf120c 100644
--- a/TAO/tao/RTCORBA/Thread_Pool.h
+++ b/TAO/tao/RTCORBA/Thread_Pool.h
@@ -237,7 +237,7 @@ private:
   ACE_Time_Value const dynamic_thread_idle_timeout_;
 
   /// Lock to guard all members of the lane
-  mutable ACE_SYNCH_MUTEX lock_;
+  mutable TAO_SYNCH_MUTEX lock_;
 };
 
 class TAO_Thread_Pool_Manager;
@@ -445,7 +445,7 @@ private:
 
   THREAD_POOLS thread_pools_;
   RTCORBA::ThreadpoolId thread_pool_id_counter_;
-  ACE_SYNCH_MUTEX lock_;
+  TAO_SYNCH_MUTEX lock_;
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL