Mon Dec 3 13:49:18 UTC 2007 Abdullah Sowayan <abdullah.sowayan@lmco.com>

20 files changed, 54 insertions, 50 deletions

diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.cpp
index 962a359017e..1137af088b0 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.cpp
@@ -41,7 +41,7 @@ TAO_EC_TPC_Dispatching::~TAO_EC_TPC_Dispatching ()
 int
 TAO_EC_TPC_Dispatching::add_consumer (RtecEventComm::PushConsumer_ptr consumer)
 {
-  ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, -1);
+  ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, -1);
 
   // Duplicate the pointer and hold it safely
   RtecEventComm::PushConsumer_var pc =
@@ -97,7 +97,7 @@ TAO_EC_TPC_Dispatching::add_consumer (RtecEventComm::PushConsumer_ptr consumer)
 int
 TAO_EC_TPC_Dispatching::remove_consumer (RtecEventComm::PushConsumer_ptr consumer)
 {
-  ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, -1);
+  ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, -1);
 
   TAO_EC_Dispatching_Task* dtask = 0;
 
@@ -131,7 +131,7 @@ TAO_EC_TPC_Dispatching::activate (void)
 void
 TAO_EC_TPC_Dispatching::shutdown (void)
 {
-  ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->lock_);
+  ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_);
 
   // The MT_Dispatching strategy sends a TAO_EC_Shutdown_Task_Command
   // to the dispatching task.  Is that what we should do here?
@@ -183,7 +183,7 @@ TAO_EC_TPC_Dispatching::push_nocopy (TAO_EC_ProxyPushSupplier* proxy,
   if (TAO_EC_TPC_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG, "EC (%P|%t) TPC_Dispatching::push_nocopy(supplier=%@,consumer=%@)\n", proxy, consumer));
 
-  ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->lock_);
+  ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_);
   TAO_EC_Dispatching_Task* dtask;
 
   if (this->consumer_task_map_.find (consumer, dtask) == -1)
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.h b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.h
index b7ece85cb30..89b1cfbb81b 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.h
@@ -88,7 +88,7 @@ private:
   // Lock for modifying the map.  It's not enough to have a lock only
   // on the map, because we have to hold the map constant while doing
   // multiple distinct map manipulations, such as in remove_consumer().
-  ACE_SYNCH_MUTEX lock_;
+  TAO_SYNCH_MUTEX lock_;
 
   // Service object information
   TAO_EC_Queue_Full_Service_Object* queue_full_service_object_;  // @@ who will release?
diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp
index 6d8c87e0ec5..bb186614eb8 100644
--- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp
+++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ClientRequest_Interceptor.cpp
@@ -37,7 +37,7 @@ namespace TAO
 
     // Would be nice to have runtime option.
     ACE_NEW (this->lock_,
-             ACE_Lock_Adapter<ACE_SYNCH_MUTEX>);
+             ACE_Lock_Adapter<TAO_SYNCH_MUTEX>);
 
   }
 
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.h
index c362d5f67c9..a841cdb2b07 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.h
@@ -41,7 +41,7 @@ public:
     void get_state(FtRtecEventChannelAdmin::CachedOptionResults& state);
     void set_state(const FtRtecEventChannelAdmin::CachedOptionResults& state);
 private:
-   typedef ACE_Hash_Map_Manager<ACE_CString, CachedRequestInfo, ACE_SYNCH_MUTEX> TableImpl;
+   typedef ACE_Hash_Map_Manager<ACE_CString, CachedRequestInfo, TAO_SYNCH_MUTEX> TableImpl;
    TableImpl table_;
 };
 
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.h
index d21db5c3fa8..aac9b9dad39 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.h
@@ -41,7 +41,7 @@ public:
   };
 
   typedef auto_ptr<Info> Info_ptr;
-  friend class ACE_Singleton<GroupInfoPublisherBase, ACE_SYNCH_MUTEX>;
+  friend class ACE_Singleton<GroupInfoPublisherBase, TAO_SYNCH_MUTEX>;
 
   void subscribe(TAO_FTEC_Become_Primary_Listener* listener);
   void set_naming_context(CosNaming::NamingContext_var naming_context);
@@ -75,7 +75,7 @@ private:
   Info_ptr info_;
 };
 
-typedef ACE_Singleton<GroupInfoPublisherBase, ACE_SYNCH_MUTEX> GroupInfoPublisher;
+typedef ACE_Singleton<GroupInfoPublisherBase, TAO_SYNCH_MUTEX> GroupInfoPublisher;
 
 TAO_END_VERSIONED_NAMESPACE_DECL
 
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.h
index d1938c74516..9e8d3df836d 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ObjectGroupManagerHandler.h
@@ -40,7 +40,7 @@ public:
   virtual void set_state_excep (::Messaging::ExceptionHolder * excep_holder);
 private:
   ACE_Auto_Event& evt_;
-  ACE_Atomic_Op< ACE_SYNCH_MUTEX, int > num_backups_;
+  ACE_Atomic_Op< TAO_SYNCH_MUTEX, int > num_backups_;
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Update_Manager.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Update_Manager.cpp
index c207baefd16..63ed805a07a 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Update_Manager.cpp
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Update_Manager.cpp
@@ -30,7 +30,7 @@ Update_Manager::~Update_Manager()
 
 void Update_Manager::handle_reply(int id)
 {
-  ACE_Guard<ACE_SYNCH_MUTEX> guard(mutex_);
+  ACE_Guard<TAO_SYNCH_MUTEX> guard(mutex_);
   replied_[id] = true;
 
   if ((replied_ & signal_condition_) == signal_condition_) {
@@ -43,7 +43,7 @@ void Update_Manager::handle_reply(int id)
 
 void Update_Manager::handle_exception(int id)
 {
-  ACE_Guard<ACE_SYNCH_MUTEX> guard(mutex_);
+  ACE_Guard<TAO_SYNCH_MUTEX> guard(mutex_);
   replied_[id] = true;
   ++transaction_level_;
 
diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Update_Manager.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Update_Manager.h
index caacd63fffe..2fed0651215 100644
--- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Update_Manager.h
+++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/Update_Manager.h
@@ -15,6 +15,7 @@
 
 #include "ace/Synch_T.h"
 #include "orbsvcs/FtRtEvent/EventChannel/Dynamic_Bitset.h"
+#include "tao/orbconf.h"
 
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
@@ -44,7 +45,7 @@ private:
   int num_backups_;
   int transaction_level_;
   bool& success_;
-  ACE_SYNCH_MUTEX mutex_;
+  TAO_SYNCH_MUTEX mutex_;
 };
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.cpp b/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.cpp
index d528161d9da..90c4b945a24 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.cpp
@@ -55,7 +55,7 @@ TAO_Notify_Buffering_Strategy::update_qos_properties
 void
 TAO_Notify_Buffering_Strategy::shutdown (void)
 {
-  ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->global_queue_lock_);
+  ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->global_queue_lock_);
 
   if (this->shutdown_)
   {
@@ -75,7 +75,7 @@ TAO_Notify_Buffering_Strategy::oldest_event (void)
   ACE_Time_Value tv (ACE_Time_Value::max_time);
   ACE_Message_Block* mb = 0;
 
-  ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->global_queue_lock_, tv);
+  ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->global_queue_lock_, tv);
   TAO_Notify_Message_Queue::ITERATOR itr (this->msg_queue_);
   while(itr.next (mb))
     {
@@ -96,7 +96,7 @@ TAO_Notify_Buffering_Strategy::oldest_event (void)
 int
 TAO_Notify_Buffering_Strategy::enqueue (TAO_Notify_Method_Request_Queueable* method_request)
 {
-  ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->global_queue_lock_, -1);
+  ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->global_queue_lock_, -1);
 
   if (this->shutdown_)
     return -1;
@@ -168,7 +168,7 @@ TAO_Notify_Buffering_Strategy::dequeue (TAO_Notify_Method_Request_Queueable* &me
 {
   ACE_Message_Block *mb;
 
-  ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->global_queue_lock_, -1);
+  ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->global_queue_lock_, -1);
 
   if ( this->shutdown_ )
     return -1;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.h b/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.h
index 7b3b9b65e46..354832931d2 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Buffering_Strategy.h
@@ -89,7 +89,7 @@ private:
   TAO_Notify_AdminProperties::Ptr admin_properties_;
 
   /// The shared global lock used by all the queues.
-  ACE_SYNCH_MUTEX& global_queue_lock_;
+  TAO_SYNCH_MUTEX& global_queue_lock_;
 
   /// The global queue length - queue length accross all the queues.
   CORBA::Long& global_queue_length_;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/MonitorManager.cpp b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/MonitorManager.cpp
index 5a9ccfb368c..fa15e522f78 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/MonitorManager.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/MonitorManager.cpp
@@ -19,7 +19,7 @@ TAO_MonitorManager::TAO_MonitorManager (void)
 int
 TAO_MonitorManager::init (int argc, ACE_TCHAR* argv[])
 {
-  ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, guard, this->task_.mutex_, -1);
+  ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, this->task_.mutex_, -1);
   this->task_.argv_.add ("fake_process_name");
 
   ACE_Get_Opt opts (argc, argv, ACE_TEXT ("o:"), 0, 0,
@@ -63,7 +63,7 @@ TAO_MonitorManager::fini (void)
 {
   if (!CORBA::is_nil (this->task_.orb_.in ()))
     {
-      ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, guard, this->task_.mutex_, -1);
+      ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, this->task_.mutex_, -1);
       if (!CORBA::is_nil (this->task_.orb_.in ())) {
         this->task_.orb_->shutdown (true);
       }
@@ -78,7 +78,7 @@ TAO_MonitorManager::run (void)
   bool activate = false;
 
   {
-    ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, guard, this->task_.mutex_, -1);
+    ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, this->task_.mutex_, -1);
 
     // Work around for bug 3108. Need to create MC ORB in main thread
     // so any libs are loaded in the parent thread.
@@ -144,7 +144,7 @@ TAO_MonitorManager::ORBTask::svc (void)
 
       PortableServer::POA_var poa;
       {
-        ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, guard, this->mutex_, -1);
+        ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, this->mutex_, -1);
 
         CORBA::Object_var obj =
           this->orb_->resolve_initial_references ("RootPOA");
@@ -214,7 +214,7 @@ TAO_MonitorManager::ORBTask::svc (void)
       startup_barrier_.wait ();
       this->orb_->run ();
 
-      ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, guard, this->mutex_, -1);
+      ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, this->mutex_, -1);
 
       // Destroy the POA and ORB
       if (!CORBA::is_nil (poa.in ()))
diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/MonitorManager.h b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/MonitorManager.h
index 920c00b106f..699e513e311 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/MonitorManager.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/MonitorManager.h
@@ -42,7 +42,7 @@ private:
     ORBTask (void);
     virtual int svc (void);
 
-    ACE_SYNCH_MUTEX mutex_;
+    TAO_SYNCH_MUTEX mutex_;
     ACE_ARGV_T<char> argv_;
     CORBA::ORB_var orb_;
     ACE_TString ior_output_;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.cpp b/TAO/orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.cpp
index a03960b3607..00a36bb6797 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.cpp
@@ -161,7 +161,7 @@ Persistent_File_Allocator::allocate()
 {
   Persistent_Storage_Block* result = 0;
   size_t block_number = 0;
-  ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, 0);
+  ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, 0);
   if (!this->allocate_block(block_number))
   {
     //@@todo: this should never happen
@@ -207,7 +207,7 @@ Persistent_File_Allocator::allocate_nowrite()
 void
 Persistent_File_Allocator::used(size_t block_number)
 {
-  ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->free_blocks_lock_);
+  ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->free_blocks_lock_);
   if (DEBUG_LEVEL > 0) ACE_DEBUG ((LM_DEBUG,
     ACE_TEXT ("(%P|%t) Persistent_File_Allocator::used: %d\n"),
     static_cast<int> (block_number)
@@ -242,7 +242,7 @@ Persistent_File_Allocator::read(Persistent_Storage_Block* psb)
   {
     Persistent_Storage_Block** psbtemp = 0;
     {
-      ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->queue_lock_, false);
+      ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->queue_lock_, false);
       size_t queue_size = this->block_queue_.size();
       for (size_t idx = 0; !cached && (idx < queue_size); ++idx)
       {
@@ -284,7 +284,7 @@ Persistent_File_Allocator::write(Persistent_Storage_Block* psb)
       ACE_NEW_RETURN(ourpsb, Persistent_Storage_Block(*psb), false);
       ourpsb->set_allocator_owns(true);
     }
-    ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->queue_lock_, false);
+    ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->queue_lock_, false);
     if (DEBUG_LEVEL) ACE_DEBUG ((LM_DEBUG,
       ACE_TEXT ("(%P|%t) Queueing PSB to write block %d\n")
       , static_cast<int> (psb->block_number ())
@@ -298,7 +298,7 @@ Persistent_File_Allocator::write(Persistent_Storage_Block* psb)
 void
 Persistent_File_Allocator::free_block(const size_t block_number)
 {
-  ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->free_blocks_lock_);
+  ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->free_blocks_lock_);
   ACE_ASSERT (this->free_blocks_.is_set (block_number));
   this->free_blocks_.set_bit(block_number, false);
 }
@@ -306,7 +306,7 @@ Persistent_File_Allocator::free_block(const size_t block_number)
 bool
 Persistent_File_Allocator::allocate_block(size_t& block_number)
 {
-  ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->free_blocks_lock_, 0);
+  ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->free_blocks_lock_, 0);
   block_number = this->free_blocks_.find_first_bit(false);
   return true;
 }
@@ -331,7 +331,7 @@ Persistent_File_Allocator::shutdown_thread()
   if (this->thread_active_)
   {
     {
-      ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->queue_lock_);
+      ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->queue_lock_);
       this->terminate_thread_ = true;
       this->wake_up_thread_.signal();
     }
@@ -352,7 +352,7 @@ Persistent_File_Allocator::run()
     do_more_work = false;
     Persistent_Storage_Block * blk = 0;
     {
-      ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->queue_lock_);
+      ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->queue_lock_);
       while (this->block_queue_.is_empty() && !terminate_thread_)
       {
         this->wake_up_thread_.wait();
@@ -374,7 +374,7 @@ Persistent_File_Allocator::run()
       }
       {
         Persistent_Storage_Block * blk2 = 0;
-        ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->queue_lock_);
+        ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->queue_lock_);
         this->block_queue_.dequeue_head (blk2);
         // if this triggers, someone pushed onto the head of the queue
         // or removed the head from the queue without telling ME.
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.h b/TAO/orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.h
index db17d13a6cc..79927baa234 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Persistent_File_Allocator.h
@@ -192,9 +192,9 @@ private:
   Random_File pstore_;
   Bit_Vector free_blocks_;
   ACE_Unbounded_Queue<Persistent_Storage_Block*> block_queue_;
-  ACE_SYNCH_MUTEX lock_;
-  ACE_SYNCH_MUTEX free_blocks_lock_;
-  ACE_SYNCH_MUTEX queue_lock_;
+  TAO_SYNCH_MUTEX lock_;
+  TAO_SYNCH_MUTEX free_blocks_lock_;
+  TAO_SYNCH_MUTEX queue_lock_;
   bool terminate_thread_;
   bool thread_active_;
   ACE_SYNCH_CONDITION wake_up_thread_;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Random_File.cpp b/TAO/orbsvcs/orbsvcs/Notify/Random_File.cpp
index a106d15f382..5b1c6f1c230 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Random_File.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Random_File.cpp
@@ -35,7 +35,7 @@ ACE_OFF_T
 Random_File::size() const
 {
   Random_File * const mutable_this = const_cast<Random_File *> (this);
-  ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, 0);
+  ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, 0);
   ACE_OFF_T original_pos = mutable_this->tell ();
   mutable_this->ACE_FILE::seek(0, SEEK_END);
   ACE_OFF_T cursize = mutable_this->tell();
@@ -50,7 +50,7 @@ Random_File::size() const
 bool
 Random_File::open(const ACE_TCHAR* filename, size_t block_size)
 {
-  ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, false);
+  ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, false);
   this->block_size_ = block_size;
   bool result = (this->close() == 0);
 
@@ -87,7 +87,7 @@ Random_File::open(const ACE_TCHAR* filename, size_t block_size)
 bool
 Random_File::write(const size_t block_number, void* buf, bool atomic)
 {
-  ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, false);
+  ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, false);
   if (DEBUG_LEVEL > 8) ACE_DEBUG ((LM_DEBUG,
     ACE_TEXT ("(%P|%t) Write block %d %c\n"),
     static_cast<int> (block_number),
@@ -122,7 +122,7 @@ Random_File::write(const size_t block_number, void* buf, bool atomic)
 bool
 Random_File::read(const size_t block_number, void* buf)
 {
-  ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, false);
+  ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, false);
   if (DEBUG_LEVEL > 8) ACE_DEBUG ((LM_DEBUG,
     ACE_TEXT ("(%P|%t) Read block %d\n"),
     static_cast<int> (block_number)
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Random_File.h b/TAO/orbsvcs/orbsvcs/Notify/Random_File.h
index 87a5513ac50..0f197c6dceb 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Random_File.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Random_File.h
@@ -28,6 +28,8 @@
 #include "ace/streams.h"
 #include "ace/Synch_T.h"
 
+#include "tao/orbconf.h"
+
 TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO_Notify
@@ -83,7 +85,7 @@ private:
 
 private:
   size_t block_size_;
-  mutable ACE_SYNCH_MUTEX lock_;
+  mutable TAO_SYNCH_MUTEX lock_;
 };
 
 } /* namespace TAO_Notify */
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.cpp b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.cpp
index 75b64de8f05..d669f2dde34 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.cpp
@@ -43,7 +43,7 @@ Routing_Slip_Persistence_Manager::~Routing_Slip_Persistence_Manager()
 void
 Routing_Slip_Persistence_Manager::set_callback(Persistent_Callback* callback)
 {
-  ACE_GUARD(ACE_SYNCH_MUTEX, ace_mon, this->lock_);
+  ACE_GUARD(TAO_SYNCH_MUTEX, ace_mon, this->lock_);
   this->callback_ = callback;
 }
 
@@ -73,7 +73,7 @@ Routing_Slip_Persistence_Manager::store_root()
   versioninfo.wr_ptr()[0] = 1; // Major version number
   versioninfo.wr_ptr()[1] = 0; // Minor version number
   versioninfo.wr_ptr(2);
-  ACE_GUARD_RETURN(ACE_SYNCH_MUTEX, ace_mon, this->lock_, result);
+  ACE_GUARD_RETURN(TAO_SYNCH_MUTEX, ace_mon, this->lock_, result);
   result = this->build_chain(this->first_routing_slip_block_,
     this->routing_slip_header_, this->allocated_routing_slip_blocks_,
     versioninfo);
@@ -204,7 +204,7 @@ Routing_Slip_Persistence_Manager::store(const ACE_Message_Block& event,
   const ACE_Message_Block& routing_slip)
 {
   bool result = false;
-  ACE_GUARD_RETURN(ACE_SYNCH_MUTEX, ace_mon, this->lock_, result);
+  ACE_GUARD_RETURN(TAO_SYNCH_MUTEX, ace_mon, this->lock_, result);
   if (!this->removed_)
   {
     result = store_i(event, routing_slip);
@@ -216,7 +216,7 @@ bool
 Routing_Slip_Persistence_Manager::update(const ACE_Message_Block& routing_slip)
 {
   bool result = false;
-  ACE_GUARD_RETURN(ACE_SYNCH_MUTEX, ace_mon, this->lock_, result);
+  ACE_GUARD_RETURN(TAO_SYNCH_MUTEX, ace_mon, this->lock_, result);
   // If we have not gotten the event yet or we have no allocator, fail
   if (!this->removed_)
   {
@@ -232,7 +232,7 @@ bool
 Routing_Slip_Persistence_Manager::remove()
 {
   bool result = false;
-  ACE_GUARD_RETURN(ACE_SYNCH_MUTEX, ace_mon, this->lock_, result);
+  ACE_GUARD_RETURN(TAO_SYNCH_MUTEX, ace_mon, this->lock_, result);
   // Assert that this is in the dllist
   ACE_ASSERT(this->prev_manager_ != this);
   ACE_ASSERT(this->persisted());
@@ -702,7 +702,7 @@ Routing_Slip_Persistence_Manager::update_next_manager(
   Routing_Slip_Persistence_Manager* next)
 {
   bool result = false;
-  ACE_GUARD_RETURN(ACE_SYNCH_MUTEX, ace_mon, this->lock_, result);
+  ACE_GUARD_RETURN(TAO_SYNCH_MUTEX, ace_mon, this->lock_, result);
   ACE_ASSERT(this->persisted());
   if (!this->removed_)
   {
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.h b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.h
index 0704a315884..6cd9014632a 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Routing_Slip_Persistence_Manager.h
@@ -25,6 +25,7 @@
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
 #include "tao/Versioned_Namespace.h"
+#include "tao/orbconf.h"
 #include "ace/Message_Block.h"
 #include "ace/Synch_T.h"
 #include "ace/Containers_T.h"
@@ -238,7 +239,7 @@ private:
   void remove_from_dllist();
 
 private:
-  ACE_SYNCH_MUTEX lock_;
+  TAO_SYNCH_MUTEX lock_;
   bool removed_;
   ACE_UINT64 serial_number_;
   Persistent_File_Allocator* allocator_;
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Standard_Event_Persistence.h b/TAO/orbsvcs/orbsvcs/Notify/Standard_Event_Persistence.h
index 995577d761a..40870c9e126 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Standard_Event_Persistence.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Standard_Event_Persistence.h
@@ -86,7 +86,7 @@ namespace TAO_Notify
     Routing_Slip_Persistence_Manager & root();
 
   public:
-    ACE_SYNCH_MUTEX lock;
+    TAO_SYNCH_MUTEX lock;
 
   private:
     Persistent_File_Allocator allocator_;
diff --git a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp
index 50531374cbd..269eb9c09e8 100644
--- a/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Scheduler_Factory.cpp
@@ -102,7 +102,7 @@ struct ACE_Scheduler_Factory_Data
   // The static runtime scheduler.
 */
 
-  TAO_Reconfig_Scheduler<TAO_MUF_FAIR_Reconfig_Sched_Strategy, ACE_SYNCH_MUTEX> scheduler_;
+  TAO_Reconfig_Scheduler<TAO_MUF_FAIR_Reconfig_Sched_Strategy, TAO_SYNCH_MUTEX> scheduler_;
   // The scheduler.
 
   ACE_TSS<ACE_TSS_Type_Adapter<RtecScheduler::Preemption_Priority_t> >