*** empty log message ***

3 files changed, 17 insertions, 17 deletions

diff --git a/examples/ASX/Event_Server/Event_Server/Peer_Router.cpp b/examples/ASX/Event_Server/Event_Server/Peer_Router.cpp
index f69c0f0fe9c..b460d45962a 100644
--- a/examples/ASX/Event_Server/Event_Server/Peer_Router.cpp
+++ b/examples/ASX/Event_Server/Event_Server/Peer_Router.cpp
@@ -118,7 +118,7 @@ Peer_Router_Context::~Peer_Router_Context (void)
 		    "(%t) closing down peer on handle %d\n", 
 		    ss->ext_id_));
 
-      if (ACE_Service_Config::reactor ()->remove_handler
+      if (ACE_Reactor::instance()->remove_handler
 	  (ss->ext_id_, ACE_Event_Handler::READ_MASK) == -1)
 	ACE_ERROR ((LM_ERROR, "(%t) p\n", "remove_handle"));
     }
@@ -245,7 +245,7 @@ Peer_Handler::open (void *)
 	      "(%t) Peer_Handler::open registering with Reactor for handle_input\n"));
 #else
   // Register with the Reactor to receive messages from our Peer.
-  if (ACE_Service_Config::reactor ()->register_handler 
+  if (ACE_Reactor::instance()->register_handler 
       (this, ACE_Event_Handler::READ_MASK) == -1)
     ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "register_handler"), -1);
 #endif
diff --git a/examples/ASX/Event_Server/Event_Server/event_server.cpp b/examples/ASX/Event_Server/Event_Server/event_server.cpp
index 148ded0a213..916f026c9e1 100644
--- a/examples/ASX/Event_Server/Event_Server/event_server.cpp
+++ b/examples/ASX/Event_Server/Event_Server/event_server.cpp
@@ -22,15 +22,15 @@ public:
 };
 
 Quit_Handler::Quit_Handler (void)
-  : ACE_Sig_Adapter (ACE_Sig_Handler_Ex (ACE_Service_Config::end_reactor_event_loop))
+  : ACE_Sig_Adapter (ACE_Sig_Handler_Ex (ACE_Reactor::end_event_loop))
 {  
   // Register to trap input from the user.
   if (ACE::register_stdin_handler (this,
-				   ACE_Service_Config::reactor (),
-				   ACE_Service_Config::thr_mgr ()) == -1)
+				   ACE_Reactor::instance(),
+				   ACE_Thread_Manager::instance ()) == -1)
     ACE_ERROR ((LM_ERROR, "%p\n", "register_stdin_handler"));
   // Register to trap the SIGINT signal.
-  else if (ACE_Service_Config::reactor ()->register_handler 
+  else if (ACE_Reactor::instance()->register_handler 
 	   (SIGINT, this) == -1)
     ACE_ERROR ((LM_ERROR, "%p\n", "register_handler"));
 }
@@ -48,7 +48,7 @@ Quit_Handler::handle_input (ACE_HANDLE)
   ACE_DEBUG ((LM_INFO, "(%t) closing down the test\n"));
   Options::instance ()->print_results ();
 
-  ACE_Service_Config::end_reactor_event_loop ();
+  ACE_Reactor::end_event_loop();
   return -1;
 }
 
@@ -133,13 +133,13 @@ main (int argc, char *argv[])
     // Perform the main event loop waiting for the user to type ^C or
     // to enter a line on the ACE_STDIN.
 
-    daemon.run_reactor_event_loop ();
+    ACE_Reactor::run_event_loop();
     // The destructor of event_server will close down the stream and
     // call the close() hooks on all the ACE_Tasks.
   }
 
   // Wait for the threads to exit.
-  ACE_Service_Config::thr_mgr ()->wait ();
+  ACE_Thread_Manager::instance ()->wait ();
   ACE_DEBUG ((LM_DEBUG, "exiting main\n"));
 #else
   ACE_UNUSED_ARG (argc);
diff --git a/examples/ASX/Event_Server/Transceiver/transceiver.cpp b/examples/ASX/Event_Server/Transceiver/transceiver.cpp
index 6c6e4a29ce4..343c7b65c57 100644
--- a/examples/ASX/Event_Server/Transceiver/transceiver.cpp
+++ b/examples/ASX/Event_Server/Transceiver/transceiver.cpp
@@ -96,7 +96,7 @@ int
 Event_Transceiver::handle_close (ACE_HANDLE,
 				 ACE_Reactor_Mask)
 {
-  ACE_Service_Config::end_reactor_event_loop ();  
+  ACE_Reactor::end_event_loop();  
   return 0;
 }
 
@@ -109,7 +109,7 @@ Event_Transceiver::handle_signal (int signum,
 {
   ACE_DEBUG ((LM_DEBUG, "(%P|%t) received signal %S\n", signum));
   
-  ACE_Service_Config::end_reactor_event_loop ();
+  ACE_Reactor::end_event_loop();
   return 0;
 }
 
@@ -122,13 +122,13 @@ Event_Transceiver::Event_Transceiver (void)
 
 #if !defined (ACE_WIN32)
 
-  if (ACE_Service_Config::reactor ()->register_handler 
+  if (ACE_Reactor::instance()->register_handler 
       (sig_set, this) == -1)
     ACE_ERROR ((LM_ERROR, "%p\n", "register_handler"));
 
 #else
 
-  if (ACE_Service_Config::reactor ()->register_handler 
+  if (ACE_Reactor::instance()->register_handler 
       (SIGINT, this) == -1)
     ACE_ERROR ((LM_ERROR, "%p\n", "register_handler"));
 
@@ -138,8 +138,8 @@ Event_Transceiver::Event_Transceiver (void)
   // otherwise <get_handle> will return the connection socket handle
   // for the peer.
   else if (ACE::register_stdin_handler (this,
-					ACE_Service_Config::reactor (),
-					ACE_Service_Config::thr_mgr ()) == -1)
+					ACE_Reactor::instance(),
+					ACE_Thread_Manager::instance ()) == -1)
     ACE_ERROR ((LM_ERROR, 
 		"%p\n", 
 		"register_stdin_handler"));
@@ -150,7 +150,7 @@ Event_Transceiver::open (void *)
 {
   // Register ourselves to be notified when there's data on the
   // socket.
-  if (ACE_Service_Config::reactor ()->register_handler
+  if (ACE_Reactor::instance()->register_handler
 	   (this, ACE_Event_Handler::READ_MASK) == -1)
     ACE_ERROR_RETURN ((LM_ERROR, 
 		       "%p\n", 
@@ -224,7 +224,7 @@ main (int argc, char *argv[])
 
   // Run event loop until either the event server shuts down or we get
   // a SIGINT.
-  ACE_Service_Config::run_reactor_event_loop ();
+  ACE_Reactor::run_event_loop();
   return 0;
 }