ChangeLogTag: Thu Feb 1 20:29:54 2001 Frank Hunleth <fhunleth@cs.wustl.edu>

9 files changed, 21 insertions, 21 deletions

diff --git a/TAO/tests/Leader_Followers/client.cpp b/TAO/tests/Leader_Followers/client.cpp
index 153858d6192..d712fbff103 100644
--- a/TAO/tests/Leader_Followers/client.cpp
+++ b/TAO/tests/Leader_Followers/client.cpp
@@ -117,7 +117,7 @@ public:
           ACE_Time_Value sleep_for_this_thread;
 
           {
-            ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, -1);
+            ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, -1);
 
             this->work_so_far_ += remote_work / number_of_client_threads;
             work_from_this_thread = this->work_so_far_;
@@ -167,7 +167,7 @@ private:
   u_long work_so_far_;
   // Work counter.
 
-  ACE_SYNCH_MUTEX lock_;
+  TAO_SYNCH_MUTEX lock_;
   // Lock for work counter.
 
   u_long sleep_;
@@ -192,7 +192,7 @@ public:
           u_long event_loop_timeout_for_this_thread = 0;
 
           {
-            ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, -1);
+            ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, this->lock_, -1);
 
             this->event_loop_timeout_so_far_ += event_loop_timeout / number_of_event_loop_threads;
             event_loop_timeout_for_this_thread = this->event_loop_timeout_so_far_;
@@ -232,7 +232,7 @@ private:
   u_long event_loop_timeout_so_far_;
   // Event loop timeout counter.
 
-  ACE_SYNCH_MUTEX lock_;
+  TAO_SYNCH_MUTEX lock_;
   // Lock for event loop timeout counter.
 };
 
diff --git a/TAO/tests/LongUpcalls/AMI_Manager.cpp b/TAO/tests/LongUpcalls/AMI_Manager.cpp
index 7f7c5008d22..9d7ed3b8390 100644
--- a/TAO/tests/LongUpcalls/AMI_Manager.cpp
+++ b/TAO/tests/LongUpcalls/AMI_Manager.cpp
@@ -57,7 +57,7 @@ Worker::svc (void)
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
-      ACE_SYNCH_MUTEX mutex;
+      TAO_SYNCH_MUTEX mutex;
       int pending_requests = 2;
       Test::AMI_ControllerHandler_var handler;
 
@@ -92,7 +92,7 @@ Worker::svc (void)
           ACE_Time_Value tv (0, 1000 * this->milliseconds_);
           this->orb_->run (tv);
 
-          ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, mutex, -1);
+          ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, mutex, -1);
           if (pending_requests == 0)
             break;
         }
@@ -108,7 +108,7 @@ Worker::svc (void)
 
 // ****************************************************************
 
-Controller_Handler::Controller_Handler (ACE_SYNCH_MUTEX *mutex,
+Controller_Handler::Controller_Handler (TAO_SYNCH_MUTEX *mutex,
                                         int *pending_replies)
   :  mutex_ (mutex)
   ,  pending_replies_ (pending_replies)
@@ -119,7 +119,7 @@ void
 Controller_Handler::worker_started (CORBA::Environment &)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, *this->mutex_);
+  ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, *this->mutex_);
   (*this->pending_replies_)--;
 }
 
@@ -147,7 +147,7 @@ void
 Controller_Handler::worker_finished (CORBA::Environment &)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, *this->mutex_);
+  ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, *this->mutex_);
   (*this->pending_replies_)--;
 }
 
diff --git a/TAO/tests/LongUpcalls/AMI_Manager.h b/TAO/tests/LongUpcalls/AMI_Manager.h
index 0ce7d46a5d9..f532c652979 100644
--- a/TAO/tests/LongUpcalls/AMI_Manager.h
+++ b/TAO/tests/LongUpcalls/AMI_Manager.h
@@ -68,7 +68,7 @@ class Controller_Handler
   ,  public virtual PortableServer::RefCountServantBase
 {
 public:
-  Controller_Handler (ACE_SYNCH_MUTEX *mutex,
+  Controller_Handler (TAO_SYNCH_MUTEX *mutex,
                       int *pending_replies);
   // Constructor
 
@@ -84,7 +84,7 @@ public:
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
-  ACE_SYNCH_MUTEX *mutex_;
+  TAO_SYNCH_MUTEX *mutex_;
   int *pending_replies_;
   // The pending replies is decremented each time a reply is
   // received.
diff --git a/TAO/tests/LongUpcalls/Controller.cpp b/TAO/tests/LongUpcalls/Controller.cpp
index 759a6169192..a9bbc43502e 100644
--- a/TAO/tests/LongUpcalls/Controller.cpp
+++ b/TAO/tests/LongUpcalls/Controller.cpp
@@ -14,7 +14,7 @@ Controller::Controller (void)
 void
 Controller::dump_results ()
 {
-  ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->mutex_);
+  ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_);
   if (this->start_count_ != this->finish_count_)
     {
       ACE_ERROR ((LM_ERROR,
@@ -27,7 +27,7 @@ void
 Controller::worker_started (CORBA::Environment &)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->mutex_);
+  ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_);
   this->start_count_++;
 
   // ACE_DEBUG ((LM_DEBUG, "Received worker start report\n"));
@@ -37,7 +37,7 @@ void
 Controller::worker_finished (CORBA::Environment &)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  ACE_GUARD (ACE_SYNCH_MUTEX, ace_mon, this->mutex_);
+  ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_);
   this->finish_count_++;
 
   // ACE_DEBUG ((LM_DEBUG, "Received worker completion report\n"));
diff --git a/TAO/tests/LongUpcalls/Controller.h b/TAO/tests/LongUpcalls/Controller.h
index 5982f8afa97..f2378a291b4 100644
--- a/TAO/tests/LongUpcalls/Controller.h
+++ b/TAO/tests/LongUpcalls/Controller.h
@@ -32,7 +32,7 @@ public:
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
-  ACE_SYNCH_MUTEX mutex_;
+  TAO_SYNCH_MUTEX mutex_;
   CORBA::ULong start_count_;
   CORBA::ULong finish_count_;
 };
diff --git a/TAO/tests/Param_Test/helper.cpp b/TAO/tests/Param_Test/helper.cpp
index f9a6947289d..b01f15f1cfd 100644
--- a/TAO/tests/Param_Test/helper.cpp
+++ b/TAO/tests/Param_Test/helper.cpp
@@ -120,7 +120,7 @@ Generator::gen_step (void)
 }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Singleton<Generator, ACE_SYNCH_RECURSIVE_MUTEX>;
+template class ACE_Singleton<Generator, TAO_SYNCH_RECURSIVE_MUTEX>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Singleton<Generator, ACE_SYNCH_RECURSIVE_MUTEX>
+#pragma instantiate ACE_Singleton<Generator, TAO_SYNCH_RECURSIVE_MUTEX>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tests/Param_Test/helper.h b/TAO/tests/Param_Test/helper.h
index 40f34ebc344..b1bc3561de7 100644
--- a/TAO/tests/Param_Test/helper.h
+++ b/TAO/tests/Param_Test/helper.h
@@ -45,5 +45,5 @@ public:
   Param_Test::Step step_;
 };
 
-typedef ACE_Singleton<Generator, ACE_SYNCH_RECURSIVE_MUTEX> GENERATOR;
+typedef ACE_Singleton<Generator, TAO_SYNCH_RECURSIVE_MUTEX> GENERATOR;
 #endif /* HELPER_H */
diff --git a/TAO/tests/Param_Test/options.cpp b/TAO/tests/Param_Test/options.cpp
index 725e0eeb5e6..2e57e28a9d2 100644
--- a/TAO/tests/Param_Test/options.cpp
+++ b/TAO/tests/Param_Test/options.cpp
@@ -238,7 +238,7 @@ Options::shutdown (void) const
 }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-template class ACE_Singleton<Options, ACE_SYNCH_RECURSIVE_MUTEX>;
+template class ACE_Singleton<Options, TAO_SYNCH_RECURSIVE_MUTEX>;
 #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-#pragma instantiate ACE_Singleton<Options, ACE_SYNCH_RECURSIVE_MUTEX>
+#pragma instantiate ACE_Singleton<Options, TAO_SYNCH_RECURSIVE_MUTEX>
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tests/Param_Test/options.h b/TAO/tests/Param_Test/options.h
index 26738972170..8e93cd4fa73 100644
--- a/TAO/tests/Param_Test/options.h
+++ b/TAO/tests/Param_Test/options.h
@@ -128,6 +128,6 @@ private:
   // server shutdown flag.
 };
 
-typedef ACE_Singleton<Options, ACE_SYNCH_RECURSIVE_MUTEX> OPTIONS;
+typedef ACE_Singleton<Options, TAO_SYNCH_RECURSIVE_MUTEX> OPTIONS;
 
 #endif /* OPTIONS_H */