*** empty log message ***

17 files changed, 25 insertions, 25 deletions

diff --git a/TAO/IIOP/test/Orbix/base_server/tpr.cpp b/TAO/IIOP/test/Orbix/base_server/tpr.cpp
index bd8a1c5e899..415410aea9f 100644
--- a/TAO/IIOP/test/Orbix/base_server/tpr.cpp
+++ b/TAO/IIOP/test/Orbix/base_server/tpr.cpp
@@ -3,7 +3,7 @@
 void *
 worker(void *vp)
 {
-  ACE_Thread_Control tc (ACE_Service_Config::thr_mgr ());
+  ACE_Thread_Control tc (ACE_Thread_Manager::instance ());
   CORBA::Orbix.continueThreadDispatch (*(CORBA::Request *)vp);
   return NULL;
 }
@@ -15,7 +15,7 @@ tpr_filter::inRequestPreMarshal(CORBA::Request &r,  CORBA::Environment&)
 //   thread_t	tid;
 //   thr_create(NULL, 0, worker, (void *)&r, THR_DETACHED, &tid);
 
-  ACE_Thread_Manager *thr_mgr = ACE_Service_Config::thr_mgr ();
+  ACE_Thread_Manager *thr_mgr = ACE_Thread_Manager::instance ();
   thr_mgr->spawn (ACE_THR_FUNC (worker),
                   (void *) &r, 
                   THR_DETACHED);
diff --git a/TAO/IIOP/test/Orbix/tpool/tpool.cpp b/TAO/IIOP/test/Orbix/tpool/tpool.cpp
index bbfca583301..5d1fbd1a638 100644
--- a/TAO/IIOP/test/Orbix/tpool/tpool.cpp
+++ b/TAO/IIOP/test/Orbix/tpool/tpool.cpp
@@ -1,7 +1,7 @@
 #include "tpool.h"
 
 Thread_Pool::Thread_Pool (int n_threads)
-  : ACE_Task<ACE_MT_SYNCH> (ACE_Service_Config::thr_mgr ())
+  : ACE_Task<ACE_MT_SYNCH> (ACE_Thread_Manager::instance ())
 {
   if (this->activate (THR_DETACHED | THR_NEW_LWP, n_threads) == -1)
     ACE_ERROR ((LM_ERROR, "%p\n", "activate failed"));
diff --git a/TAO/IIOP/test/Orbix/tpr/tpr.cpp b/TAO/IIOP/test/Orbix/tpr/tpr.cpp
index bd8a1c5e899..415410aea9f 100644
--- a/TAO/IIOP/test/Orbix/tpr/tpr.cpp
+++ b/TAO/IIOP/test/Orbix/tpr/tpr.cpp
@@ -3,7 +3,7 @@
 void *
 worker(void *vp)
 {
-  ACE_Thread_Control tc (ACE_Service_Config::thr_mgr ());
+  ACE_Thread_Control tc (ACE_Thread_Manager::instance ());
   CORBA::Orbix.continueThreadDispatch (*(CORBA::Request *)vp);
   return NULL;
 }
@@ -15,7 +15,7 @@ tpr_filter::inRequestPreMarshal(CORBA::Request &r,  CORBA::Environment&)
 //   thread_t	tid;
 //   thr_create(NULL, 0, worker, (void *)&r, THR_DETACHED, &tid);
 
-  ACE_Thread_Manager *thr_mgr = ACE_Service_Config::thr_mgr ();
+  ACE_Thread_Manager *thr_mgr = ACE_Thread_Manager::instance ();
   thr_mgr->spawn (ACE_THR_FUNC (worker),
                   (void *) &r, 
                   THR_DETACHED);
diff --git a/TAO/IIOP/test/svr.cpp b/TAO/IIOP/test/svr.cpp
index 0e537bc6206..53fac60bf6d 100644
--- a/TAO/IIOP/test/svr.cpp
+++ b/TAO/IIOP/test/svr.cpp
@@ -189,7 +189,7 @@ main (int    argc, char   *argv[])
 
 
 #if !defined(USE_HOMEBREW_EVENT_LOOP)
-  ACE_Service_Config::run_reactor_event_loop();
+  ACE_Reactor::run_event_loop();
 #else
   while (1)
     {
diff --git a/TAO/IIOP/tests/Cubit/Orbix/base_server/tpr.cpp b/TAO/IIOP/tests/Cubit/Orbix/base_server/tpr.cpp
index bd8a1c5e899..415410aea9f 100644
--- a/TAO/IIOP/tests/Cubit/Orbix/base_server/tpr.cpp
+++ b/TAO/IIOP/tests/Cubit/Orbix/base_server/tpr.cpp
@@ -3,7 +3,7 @@
 void *
 worker(void *vp)
 {
-  ACE_Thread_Control tc (ACE_Service_Config::thr_mgr ());
+  ACE_Thread_Control tc (ACE_Thread_Manager::instance ());
   CORBA::Orbix.continueThreadDispatch (*(CORBA::Request *)vp);
   return NULL;
 }
@@ -15,7 +15,7 @@ tpr_filter::inRequestPreMarshal(CORBA::Request &r,  CORBA::Environment&)
 //   thread_t	tid;
 //   thr_create(NULL, 0, worker, (void *)&r, THR_DETACHED, &tid);
 
-  ACE_Thread_Manager *thr_mgr = ACE_Service_Config::thr_mgr ();
+  ACE_Thread_Manager *thr_mgr = ACE_Thread_Manager::instance ();
   thr_mgr->spawn (ACE_THR_FUNC (worker),
                   (void *) &r, 
                   THR_DETACHED);
diff --git a/TAO/IIOP/tests/Cubit/Orbix/tpool/tpool.cpp b/TAO/IIOP/tests/Cubit/Orbix/tpool/tpool.cpp
index bbfca583301..5d1fbd1a638 100644
--- a/TAO/IIOP/tests/Cubit/Orbix/tpool/tpool.cpp
+++ b/TAO/IIOP/tests/Cubit/Orbix/tpool/tpool.cpp
@@ -1,7 +1,7 @@
 #include "tpool.h"
 
 Thread_Pool::Thread_Pool (int n_threads)
-  : ACE_Task<ACE_MT_SYNCH> (ACE_Service_Config::thr_mgr ())
+  : ACE_Task<ACE_MT_SYNCH> (ACE_Thread_Manager::instance ())
 {
   if (this->activate (THR_DETACHED | THR_NEW_LWP, n_threads) == -1)
     ACE_ERROR ((LM_ERROR, "%p\n", "activate failed"));
diff --git a/TAO/IIOP/tests/Cubit/Orbix/tpr/tpr.cpp b/TAO/IIOP/tests/Cubit/Orbix/tpr/tpr.cpp
index bd8a1c5e899..415410aea9f 100644
--- a/TAO/IIOP/tests/Cubit/Orbix/tpr/tpr.cpp
+++ b/TAO/IIOP/tests/Cubit/Orbix/tpr/tpr.cpp
@@ -3,7 +3,7 @@
 void *
 worker(void *vp)
 {
-  ACE_Thread_Control tc (ACE_Service_Config::thr_mgr ());
+  ACE_Thread_Control tc (ACE_Thread_Manager::instance ());
   CORBA::Orbix.continueThreadDispatch (*(CORBA::Request *)vp);
   return NULL;
 }
@@ -15,7 +15,7 @@ tpr_filter::inRequestPreMarshal(CORBA::Request &r,  CORBA::Environment&)
 //   thread_t	tid;
 //   thr_create(NULL, 0, worker, (void *)&r, THR_DETACHED, &tid);
 
-  ACE_Thread_Manager *thr_mgr = ACE_Service_Config::thr_mgr ();
+  ACE_Thread_Manager *thr_mgr = ACE_Thread_Manager::instance ();
   thr_mgr->spawn (ACE_THR_FUNC (worker),
                   (void *) &r, 
                   THR_DETACHED);
diff --git a/TAO/IIOP/tests/Cubit/TAO/svr.cpp b/TAO/IIOP/tests/Cubit/TAO/svr.cpp
index 0e537bc6206..53fac60bf6d 100644
--- a/TAO/IIOP/tests/Cubit/TAO/svr.cpp
+++ b/TAO/IIOP/tests/Cubit/TAO/svr.cpp
@@ -189,7 +189,7 @@ main (int    argc, char   *argv[])
 
 
 #if !defined(USE_HOMEBREW_EVENT_LOOP)
-  ACE_Service_Config::run_reactor_event_loop();
+  ACE_Reactor::run_event_loop();
 #else
   while (1)
     {
diff --git a/TAO/IIOP/tests/Thruput_test/server.cpp b/TAO/IIOP/tests/Thruput_test/server.cpp
index 4606b676c4b..6f1cf2c4895 100644
--- a/TAO/IIOP/tests/Thruput_test/server.cpp
+++ b/TAO/IIOP/tests/Thruput_test/server.cpp
@@ -196,7 +196,7 @@ main (int argc, char *const *argv)
   quantify_start_recording_data();
 #endif
 
-  ACE_Service_Config::run_reactor_event_loop();
+  ACE_Reactor::run_event_loop();
 
 #if 0
   while (1)
diff --git a/TAO/IIOP/tests/Thruput_test/ttcp_i.cpp b/TAO/IIOP/tests/Thruput_test/ttcp_i.cpp
index 1392caabd48..daba9fe6139 100644
--- a/TAO/IIOP/tests/Thruput_test/ttcp_i.cpp
+++ b/TAO/IIOP/tests/Thruput_test/ttcp_i.cpp
@@ -28,7 +28,7 @@ ttcp_sequence_i::stop_timer (CORBA_Environment &IT_env)
 	numCalls = 0;
 #if defined (USE_QUANTIFY)
     quantify_stop_recording_data();
-    ACE_Service_Config::end_reactor_event_loop();
+    ACE_Reactor::end_event_loop();
     cerr << "*********** just before exiting " << endl;
 #endif
 }
diff --git a/TAO/tao/connect.h b/TAO/tao/connect.h
index e3c9f28b92b..a84fe7ae278 100644
--- a/TAO/tao/connect.h
+++ b/TAO/tao/connect.h
@@ -34,7 +34,7 @@ class TAO_OA_Connection_Handler : public ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_NU
 {
 public:
   // @@ Please add comments.
-  TAO_OA_Connection_Handler (ACE_Thread_Manager *t = ACE_Service_Config::thr_mgr ());
+  TAO_OA_Connection_Handler (ACE_Thread_Manager *t = ACE_Thread_Manager::instance ());
   virtual int open (void *);
   virtual int svc (void);
 
diff --git a/TAO/tao/factories.cpp b/TAO/tao/factories.cpp
index 15548ccfe82..76b49cd75e6 100644
--- a/TAO/tao/factories.cpp
+++ b/TAO/tao/factories.cpp
@@ -63,13 +63,13 @@ TAO_Server_Factory::concurrency_strategy ()
   if (p->using_threads ())
     {
       // Set the strategy parameters
-      threaded_strategy_.open (ACE_Service_Config::thr_mgr (),
+      threaded_strategy_.open (ACE_Thread_Manager::instance (),
 			       ROA_DEFAULT_THREADFLAGS);
       concurrency_strategy_ = &threaded_strategy_;
     }
   else
     {
-      reactive_strategy_.open (ACE_Service_Config::reactor ());
+      reactive_strategy_.open (ACE_Reactor::instance ());
       concurrency_strategy_ = &reactive_strategy_;
     }
 
@@ -115,7 +115,7 @@ TAO_Client_Factory::TAO_Client_Factory (void)
   // When should I do this open ()?  It seems like this is way too
   // early, but doing it in the accessor for connector () seems like
   // it would be too late as well.
-  connector_.open (ACE_Service_Config::reactor (),
+  connector_.open (ACE_Reactor::instance (),
 		   &null_creation_strategy_,
 		   &caching_connect_strategy_,
 #if defined (TAO_HAS_CLIENT_CONCURRENCY)
diff --git a/TAO/tao/roa.cpp b/TAO/tao/roa.cpp
index 4ed437d7835..2b2503fcd15 100644
--- a/TAO/tao/roa.cpp
+++ b/TAO/tao/roa.cpp
@@ -68,7 +68,7 @@ ROA::ROA (CORBA_ORB_ptr owning_orb,
 
   // Initialize the endpoint ... or try!
   if (client_acceptor_.open (p->addr (),
-			     ACE_Service_Config::reactor (),
+			     ACE_Reactor::instance (),
 			     f.creation_strategy (),
 			     f.accept_strategy (),
 			     f.concurrency_strategy (),
diff --git a/TAO/tests/Cubit/Orbix/base_server/tpr.cpp b/TAO/tests/Cubit/Orbix/base_server/tpr.cpp
index bd8a1c5e899..415410aea9f 100644
--- a/TAO/tests/Cubit/Orbix/base_server/tpr.cpp
+++ b/TAO/tests/Cubit/Orbix/base_server/tpr.cpp
@@ -3,7 +3,7 @@
 void *
 worker(void *vp)
 {
-  ACE_Thread_Control tc (ACE_Service_Config::thr_mgr ());
+  ACE_Thread_Control tc (ACE_Thread_Manager::instance ());
   CORBA::Orbix.continueThreadDispatch (*(CORBA::Request *)vp);
   return NULL;
 }
@@ -15,7 +15,7 @@ tpr_filter::inRequestPreMarshal(CORBA::Request &r,  CORBA::Environment&)
 //   thread_t	tid;
 //   thr_create(NULL, 0, worker, (void *)&r, THR_DETACHED, &tid);
 
-  ACE_Thread_Manager *thr_mgr = ACE_Service_Config::thr_mgr ();
+  ACE_Thread_Manager *thr_mgr = ACE_Thread_Manager::instance ();
   thr_mgr->spawn (ACE_THR_FUNC (worker),
                   (void *) &r, 
                   THR_DETACHED);
diff --git a/TAO/tests/Cubit/Orbix/tpool/tpool.cpp b/TAO/tests/Cubit/Orbix/tpool/tpool.cpp
index bbfca583301..5d1fbd1a638 100644
--- a/TAO/tests/Cubit/Orbix/tpool/tpool.cpp
+++ b/TAO/tests/Cubit/Orbix/tpool/tpool.cpp
@@ -1,7 +1,7 @@
 #include "tpool.h"
 
 Thread_Pool::Thread_Pool (int n_threads)
-  : ACE_Task<ACE_MT_SYNCH> (ACE_Service_Config::thr_mgr ())
+  : ACE_Task<ACE_MT_SYNCH> (ACE_Thread_Manager::instance ())
 {
   if (this->activate (THR_DETACHED | THR_NEW_LWP, n_threads) == -1)
     ACE_ERROR ((LM_ERROR, "%p\n", "activate failed"));
diff --git a/TAO/tests/Cubit/Orbix/tpr/tpr.cpp b/TAO/tests/Cubit/Orbix/tpr/tpr.cpp
index bd8a1c5e899..415410aea9f 100644
--- a/TAO/tests/Cubit/Orbix/tpr/tpr.cpp
+++ b/TAO/tests/Cubit/Orbix/tpr/tpr.cpp
@@ -3,7 +3,7 @@
 void *
 worker(void *vp)
 {
-  ACE_Thread_Control tc (ACE_Service_Config::thr_mgr ());
+  ACE_Thread_Control tc (ACE_Thread_Manager::instance ());
   CORBA::Orbix.continueThreadDispatch (*(CORBA::Request *)vp);
   return NULL;
 }
@@ -15,7 +15,7 @@ tpr_filter::inRequestPreMarshal(CORBA::Request &r,  CORBA::Environment&)
 //   thread_t	tid;
 //   thr_create(NULL, 0, worker, (void *)&r, THR_DETACHED, &tid);
 
-  ACE_Thread_Manager *thr_mgr = ACE_Service_Config::thr_mgr ();
+  ACE_Thread_Manager *thr_mgr = ACE_Thread_Manager::instance ();
   thr_mgr->spawn (ACE_THR_FUNC (worker),
                   (void *) &r, 
                   THR_DETACHED);
diff --git a/TAO/tests/Cubit/TAO/svr.cpp b/TAO/tests/Cubit/TAO/svr.cpp
index fc1f6928c7d..716472c2e6b 100644
--- a/TAO/tests/Cubit/TAO/svr.cpp
+++ b/TAO/tests/Cubit/TAO/svr.cpp
@@ -191,7 +191,7 @@ main (int    argc, char   *argv[])
 
 
 #if !defined(USE_HOMEBREW_EVENT_LOOP)
-  ACE_Service_Config::run_reactor_event_loop();
+  ACE_Reactor::run_event_loop();
 #else
   while (1)
     {