Fri Nov 30 19:06:05 UTC 2007 Abdullah Sowayan <abdullah.sowayan@lmco.com>

17 files changed, 45 insertions, 22 deletions

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index 024027149b8..d5c621a492c 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,26 @@
+Fri Nov 30 19:06:05 UTC 2007  Abdullah Sowayan  <abdullah.sowayan@lmco.com>
+
+        * DAnCE/Deployment/NodeApp_CB_Impl.h:
+        * DAnCE/Deployment/NodeApp_CB_Impl.cpp:
+        * DAnCE/DomainApplicationManager/Reply_Handler_i.h:
+        * DAnCE/DomainApplicationManager/Reply_Handler_i.cpp:
+        * DAnCE/NodeManager/MonitorController.h:
+        * DAnCE/NodeManager/MonitorController.cpp:
+        * ciao/Dynamic_Component_Activator.h:
+        * ciao/Dynamic_Component_Servant_T.h:
+        * ciao/Home_Servant_Impl_T.h:
+        * ciao/Servant_Activator.h:
+        * ciao/Session_Container.h:
+        * ciao/Session_Container.cpp:
+        * ciao/Swapping_Container.h:
+        * ciao/Swapping_Container.cpp:
+        * ciao/Swapping_Servant_Home_Impl_T.h:
+        * tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_exec.h:
+
+          Parts of CIAO 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.
+
 Mon Nov 26 16:57:33 UTC 2007  Abdullah Sowayan  <abdullah.sowayan@lmco.com>
 
         * ciao/Servant_Activator.h:
diff --git a/CIAO/DAnCE/Deployment/NodeApp_CB_Impl.cpp b/CIAO/DAnCE/Deployment/NodeApp_CB_Impl.cpp
index 68b5d858a1f..af7fc329959 100644
--- a/CIAO/DAnCE/Deployment/NodeApp_CB_Impl.cpp
+++ b/CIAO/DAnCE/Deployment/NodeApp_CB_Impl.cpp
@@ -7,8 +7,8 @@ NodeApplication_Callback_Impl  (CORBA::ORB_ptr o,
                                 PortableServer::POA_ptr p,
                                 Deployment::NodeApplicationManager_ptr s,
                                 const Deployment::Properties &properties,
-                                ACE_Condition<ACE_SYNCH_MUTEX> &wait,
-                                ACE_SYNCH_MUTEX& mutex)
+                                ACE_Condition<TAO_SYNCH_MUTEX> &wait,
+                                TAO_SYNCH_MUTEX& mutex)
   : is_callback_completed_ (false),
     orb_ (CORBA::ORB::_duplicate (o)),
     poa_ (PortableServer::POA::_duplicate (p)),
diff --git a/CIAO/DAnCE/Deployment/NodeApp_CB_Impl.h b/CIAO/DAnCE/Deployment/NodeApp_CB_Impl.h
index d8c47dceb7d..68a61d3616e 100644
--- a/CIAO/DAnCE/Deployment/NodeApp_CB_Impl.h
+++ b/CIAO/DAnCE/Deployment/NodeApp_CB_Impl.h
@@ -42,8 +42,8 @@ namespace CIAO
                                    PortableServer::POA_ptr p,
                                    Deployment::NodeApplicationManager_ptr s,
                                    const Deployment::Properties &properties,
-                                   ACE_Condition<ACE_SYNCH_MUTEX> &wait,
-                                   ACE_SYNCH_MUTEX& mutex);
+                                   ACE_Condition<TAO_SYNCH_MUTEX> &wait,
+                                   TAO_SYNCH_MUTEX& mutex);
 
     /// Get the containing POA.  This operation does *not* increase
     /// the reference count of the POA.
@@ -76,9 +76,9 @@ namespace CIAO
 
     Deployment::Properties_var properties_;
 
-    ACE_Condition<ACE_SYNCH_MUTEX> &waitCond_;
+    ACE_Condition<TAO_SYNCH_MUTEX> &waitCond_;
 
-    ACE_SYNCH_MUTEX &mutex_;
+    TAO_SYNCH_MUTEX &mutex_;
   };
 }
 
diff --git a/CIAO/DAnCE/DomainApplicationManager/Reply_Handler_i.cpp b/CIAO/DAnCE/DomainApplicationManager/Reply_Handler_i.cpp
index b00b5af5b7f..6ebe08457da 100644
--- a/CIAO/DAnCE/DomainApplicationManager/Reply_Handler_i.cpp
+++ b/CIAO/DAnCE/DomainApplicationManager/Reply_Handler_i.cpp
@@ -28,7 +28,7 @@ void Deployment_AMI_NodeApplicationManagerHandler_i::startLaunch (
                "CIAO (%P|%t): Reply_Handler_i.cpp::AMI startLaunch() returned\n"));
 
   // Add your implementation here
-  ACE_Guard<ACE_SYNCH_MUTEX> guard (lock_);
+  ACE_Guard<TAO_SYNCH_MUTEX> guard (lock_);
 
   CIAO::DomainApplicationManager_AMI_Impl * ami_dam = 
     static_cast<CIAO::DomainApplicationManager_AMI_Impl*> (dam_);
diff --git a/CIAO/DAnCE/DomainApplicationManager/Reply_Handler_i.h b/CIAO/DAnCE/DomainApplicationManager/Reply_Handler_i.h
index a3d7e5d9581..57649c1c948 100644
--- a/CIAO/DAnCE/DomainApplicationManager/Reply_Handler_i.h
+++ b/CIAO/DAnCE/DomainApplicationManager/Reply_Handler_i.h
@@ -77,7 +77,7 @@ private:
 
   ::Deployment::Connections retn_connections_;
 
-  ACE_SYNCH_MUTEX lock_;
+  TAO_SYNCH_MUTEX lock_;
 
   ::CIAO::DomainApplicationManager_AMH_Impl * dam_;
 };
diff --git a/CIAO/DAnCE/NodeManager/MonitorController.cpp b/CIAO/DAnCE/NodeManager/MonitorController.cpp
index 774f09a2788..774d9a022f9 100644
--- a/CIAO/DAnCE/NodeManager/MonitorController.cpp
+++ b/CIAO/DAnCE/NodeManager/MonitorController.cpp
@@ -215,7 +215,7 @@ void
 CIAO::MonitorController::terminate ()
 {
   // make the terminate flag false
-  ACE_GUARD (ACE_SYNCH_MUTEX,
+  ACE_GUARD (TAO_SYNCH_MUTEX,
              guard,
              lock_);
 
@@ -225,7 +225,7 @@ CIAO::MonitorController::terminate ()
 bool
 CIAO::MonitorController::terminating ()
 {
-  ACE_GUARD_RETURN (ACE_SYNCH_MUTEX,
+  ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
                     guard,
                     lock_,
                     0);
diff --git a/CIAO/DAnCE/NodeManager/MonitorController.h b/CIAO/DAnCE/NodeManager/MonitorController.h
index 85d82c2cf3b..c6cbbcf5255 100644
--- a/CIAO/DAnCE/NodeManager/MonitorController.h
+++ b/CIAO/DAnCE/NodeManager/MonitorController.h
@@ -99,7 +99,7 @@ namespace CIAO
       bool terminate_flag_;
 
       /// Thread Mutex for synchronizing call
-      ACE_SYNCH_MUTEX lock_;
+      TAO_SYNCH_MUTEX lock_;
 
       /// the ORB pointer ..
       /// @todo Make this a _var
diff --git a/CIAO/ciao/Dynamic_Component_Activator.h b/CIAO/ciao/Dynamic_Component_Activator.h
index 40d9e7f75b3..577be605910 100644
--- a/CIAO/ciao/Dynamic_Component_Activator.h
+++ b/CIAO/ciao/Dynamic_Component_Activator.h
@@ -85,7 +85,7 @@ namespace CIAO
                             Dynamic_Component_Servant_Base *,
                             TAO_ObjectId_Hash,
                             ACE_Equal_To<PortableServer::ObjectId>,
-                            ACE_SYNCH_MUTEX>
+                            TAO_SYNCH_MUTEX>
       servant_map_;
   };
 }
diff --git a/CIAO/ciao/Dynamic_Component_Servant_T.h b/CIAO/ciao/Dynamic_Component_Servant_T.h
index 759ea1c524a..244a51b1891 100644
--- a/CIAO/ciao/Dynamic_Component_Servant_T.h
+++ b/CIAO/ciao/Dynamic_Component_Servant_T.h
@@ -64,7 +64,7 @@ namespace CIAO
                             COMP_SVNT *,
                             TAO_ObjectId_Hash,
                             ACE_Equal_To<PortableServer::ObjectId>,
-                            ACE_SYNCH_MUTEX>
+                            TAO_SYNCH_MUTEX>
       servant_map_;
 
     // @@ Jai, please explain what this flag means?
diff --git a/CIAO/ciao/Home_Servant_Impl_T.h b/CIAO/ciao/Home_Servant_Impl_T.h
index 439490ab829..e1c9b8b9806 100644
--- a/CIAO/ciao/Home_Servant_Impl_T.h
+++ b/CIAO/ciao/Home_Servant_Impl_T.h
@@ -86,7 +86,7 @@ namespace CIAO
                                     Components::CCMObject_var,
                                     TAO_ObjectId_Hash,
                                     ACE_Equal_To<PortableServer::ObjectId>,
-                                    ACE_SYNCH_MUTEX>
+                                    TAO_SYNCH_MUTEX>
       OBJREF_MAP;
 
     typedef OBJREF_MAP::iterator OBJ_ITERATOR;
diff --git a/CIAO/ciao/Servant_Activator.h b/CIAO/ciao/Servant_Activator.h
index 75e71681616..2da55de5d78 100644
--- a/CIAO/ciao/Servant_Activator.h
+++ b/CIAO/ciao/Servant_Activator.h
@@ -94,7 +94,7 @@ namespace CIAO
     size_t slot_index_;
 
     /// Mutex that synchronizes access to the array.
-    ACE_SYNCH_MUTEX  mutex_;
+    TAO_SYNCH_MUTEX  mutex_;
   };
 }
 
diff --git a/CIAO/ciao/Session_Container.cpp b/CIAO/ciao/Session_Container.cpp
index 6295b23d92c..76779a21100 100644
--- a/CIAO/ciao/Session_Container.cpp
+++ b/CIAO/ciao/Session_Container.cpp
@@ -16,7 +16,7 @@ namespace CIAO
 {
   ///////////////////////////////////////////////////////////////
 
-  ACE_Atomic_Op <ACE_SYNCH_MUTEX, unsigned long>
+  ACE_Atomic_Op <TAO_SYNCH_MUTEX, unsigned long>
     Session_Container::serial_number_ (0);
 
   Session_Container::Session_Container (CORBA::ORB_ptr o,
diff --git a/CIAO/ciao/Session_Container.h b/CIAO/ciao/Session_Container.h
index f1a15bfb65c..d96ef7b22bc 100644
--- a/CIAO/ciao/Session_Container.h
+++ b/CIAO/ciao/Session_Container.h
@@ -169,7 +169,7 @@ namespace CIAO
 
     /// Static variable to store the highest number we have given out until
     /// now
-    static ACE_Atomic_Op <ACE_SYNCH_MUTEX, unsigned long> serial_number_;
+    static ACE_Atomic_Op <TAO_SYNCH_MUTEX, unsigned long> serial_number_;
 
     const bool static_config_flag_;
     const Static_Config_EntryPoints_Maps* static_entrypts_maps_;
diff --git a/CIAO/ciao/Swapping_Container.cpp b/CIAO/ciao/Swapping_Container.cpp
index c337ca36bf9..68973599306 100644
--- a/CIAO/ciao/Swapping_Container.cpp
+++ b/CIAO/ciao/Swapping_Container.cpp
@@ -13,7 +13,7 @@
 namespace CIAO
 {
 
-  ACE_Atomic_Op <ACE_SYNCH_MUTEX, unsigned long>
+  ACE_Atomic_Op <TAO_SYNCH_MUTEX, unsigned long>
   Swapping_Container::serial_number_ (0);
 
   Swapping_Container::Swapping_Container (CORBA::ORB_ptr o,
diff --git a/CIAO/ciao/Swapping_Container.h b/CIAO/ciao/Swapping_Container.h
index 01e64c88e0f..784de1a6e3c 100644
--- a/CIAO/ciao/Swapping_Container.h
+++ b/CIAO/ciao/Swapping_Container.h
@@ -77,7 +77,7 @@ namespace CIAO
 
     /// Static variable to store the highest number we have given out until
     /// now
-    static ACE_Atomic_Op <ACE_SYNCH_MUTEX, unsigned long> serial_number_;
+    static ACE_Atomic_Op <TAO_SYNCH_MUTEX, unsigned long> serial_number_;
 
     Dynamic_Component_Activator *dsa_;
   };
diff --git a/CIAO/ciao/Swapping_Servant_Home_Impl_T.h b/CIAO/ciao/Swapping_Servant_Home_Impl_T.h
index 21dd5ffe65e..e6c59a6f37d 100644
--- a/CIAO/ciao/Swapping_Servant_Home_Impl_T.h
+++ b/CIAO/ciao/Swapping_Servant_Home_Impl_T.h
@@ -90,14 +90,14 @@ namespace CIAO
                             COMP_SVNT *,
                             TAO_ObjectId_Hash,
                             ACE_Equal_To<PortableServer::ObjectId>,
-                            ACE_SYNCH_MUTEX>
+                            TAO_SYNCH_MUTEX>
       component_map_;
 
     typedef ACE_Hash_Map_Manager_Ex<PortableServer::ObjectId,
                             Dynamic_Component_Servant_Base *,
                             TAO_ObjectId_Hash,
                             ACE_Equal_To<PortableServer::ObjectId>,
-                            ACE_SYNCH_MUTEX> DYNAMIC_SERVANT_MAP;
+                            TAO_SYNCH_MUTEX> DYNAMIC_SERVANT_MAP;
 
     typedef DYNAMIC_SERVANT_MAP::iterator DYNAMIC_SERVANT_MAP_ITERATOR;
     DYNAMIC_SERVANT_MAP dynamic_servant_map_;
diff --git a/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_exec.h b/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_exec.h
index bdafdd2ed94..e3a8400ca8a 100644
--- a/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_exec.h
+++ b/CIAO/tests/Bug_2130_Regression/SEC_CheckPoint/TSEC_CheckPoint_exec.h
@@ -51,7 +51,7 @@
 
 namespace Impl
 {
-  typedef ACE_SYNCH_MUTEX TMutex;
+  typedef TAO_SYNCH_MUTEX TMutex;
 
   class TSEC_CheckPoint_exec_i;