*** empty log message ***

50 files changed, 136 insertions, 136 deletions

diff --git a/examples/ASX/CCM_App/SC_Server.cpp b/examples/ASX/CCM_App/SC_Server.cpp
index eaed48d6dc3..5358ed82962 100644
--- a/examples/ASX/CCM_App/SC_Server.cpp
+++ b/examples/ASX/CCM_App/SC_Server.cpp
@@ -44,20 +44,20 @@ main (int argc, char *argv[])
   ACE_Sig_Adapter shutdown_handler ((ACE_Sig_Handler_Ex) ACE_Reactor::end_event_loop);
 
   if (ACE::register_stdin_handler (&handler,
-				   ACE_Reactor::instance(),
+				   ACE_Reactor::instance (),
 				   ACE_Thread_Manager::instance ()) == -1)
     ACE_ERROR ((LM_ERROR, "%p\n", "register_stdin_handler"));
 
   if (loggerd.open (argc, argv) == -1 && errno != ENOENT)
     ACE_ERROR ((LM_ERROR, "%p\n%a", "open", 1));
 
-  else if (ACE_Reactor::instance()->register_handler
+  else if (ACE_Reactor::instance ()->register_handler
     (SIGINT, &shutdown_handler) == -1)
     ACE_ERROR ((LM_ERROR, "%p\n%a", "register_handler", 1));
 
   // Perform logging service until we receive SIGINT.
 
-  ACE_Reactor::run_event_loop();
+  ACE_Reactor::run_event_loop ();
 
   return 0;
 }
diff --git a/examples/ASX/Event_Server/Event_Server/Peer_Router.cpp b/examples/ASX/Event_Server/Event_Server/Peer_Router.cpp
index b460d45962a..6d144a05216 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_Reactor::instance()->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_Reactor::instance()->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 916f026c9e1..6dba2c38283 100644
--- a/examples/ASX/Event_Server/Event_Server/event_server.cpp
+++ b/examples/ASX/Event_Server/Event_Server/event_server.cpp
@@ -26,11 +26,11 @@ Quit_Handler::Quit_Handler (void)
 {  
   // Register to trap input from the user.
   if (ACE::register_stdin_handler (this,
-				   ACE_Reactor::instance(),
+				   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_Reactor::instance()->register_handler 
+  else if (ACE_Reactor::instance ()->register_handler 
 	   (SIGINT, this) == -1)
     ACE_ERROR ((LM_ERROR, "%p\n", "register_handler"));
 }
@@ -133,7 +133,7 @@ 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.
 
-    ACE_Reactor::run_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.
   }
diff --git a/examples/ASX/Event_Server/Transceiver/transceiver.cpp b/examples/ASX/Event_Server/Transceiver/transceiver.cpp
index 343c7b65c57..c8904bcbb04 100644
--- a/examples/ASX/Event_Server/Transceiver/transceiver.cpp
+++ b/examples/ASX/Event_Server/Transceiver/transceiver.cpp
@@ -122,13 +122,13 @@ Event_Transceiver::Event_Transceiver (void)
 
 #if !defined (ACE_WIN32)
 
-  if (ACE_Reactor::instance()->register_handler 
+  if (ACE_Reactor::instance ()->register_handler 
       (sig_set, this) == -1)
     ACE_ERROR ((LM_ERROR, "%p\n", "register_handler"));
 
 #else
 
-  if (ACE_Reactor::instance()->register_handler 
+  if (ACE_Reactor::instance ()->register_handler 
       (SIGINT, this) == -1)
     ACE_ERROR ((LM_ERROR, "%p\n", "register_handler"));
 
@@ -138,7 +138,7 @@ 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_Reactor::instance(),
+					ACE_Reactor::instance (),
 					ACE_Thread_Manager::instance ()) == -1)
     ACE_ERROR ((LM_ERROR, 
 		"%p\n", 
@@ -150,7 +150,7 @@ Event_Transceiver::open (void *)
 {
   // Register ourselves to be notified when there's data on the
   // socket.
-  if (ACE_Reactor::instance()->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_Reactor::run_event_loop();
+  ACE_Reactor::run_event_loop ();
   return 0;
 }
 
diff --git a/examples/ASX/Message_Queue/priority_buffer.cpp b/examples/ASX/Message_Queue/priority_buffer.cpp
index ec499410db6..33eb170df12 100644
--- a/examples/ASX/Message_Queue/priority_buffer.cpp
+++ b/examples/ASX/Message_Queue/priority_buffer.cpp
@@ -43,7 +43,7 @@ consumer (ACE_Message_Queue<ACE_MT_SYNCH> *msg_queue)
         ACE_OS::puts (mb->rd_ptr ());
 
       // Free up the buffer memory and the Message_Block.
-      ACE_Allocator::instance()->free (mb->rd_ptr ());
+      ACE_Allocator::instance ()->free (mb->rd_ptr ());
       mb->release ();
 
       if (length == 0)
diff --git a/examples/ASX/UPIPE_Event_Server/Peer_Router.cpp b/examples/ASX/UPIPE_Event_Server/Peer_Router.cpp
index 5d19c430f14..e1b3846a575 100644
--- a/examples/ASX/UPIPE_Event_Server/Peer_Router.cpp
+++ b/examples/ASX/UPIPE_Event_Server/Peer_Router.cpp
@@ -38,7 +38,7 @@ Acceptor_Factory<PH, PK>::init (int argc, char *argv[])
 	 break;
        }
   
-  if (this->open (addr, ACE_Reactor::instance()) == -1)
+  if (this->open (addr, ACE_Reactor::instance ()) == -1)
     ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "open"), -1);
   return 0;
 }
@@ -139,7 +139,7 @@ Peer_Handler<ROUTER, KEY>::handle_input (ACE_HANDLE h)
 {
 
   ACE_DEBUG ((LM_DEBUG, "(%t) input arrived on sd %d\n", h));
-//  ACE_Reactor::instance()->remove_handler(h,
+//  ACE_Reactor::instance ()->remove_handler(h,
 //                                          ACE_Event_Handler::ALL_EVENTS_MASK
 //                                          |ACE_Event_Handler::DONT_CALL);
 // this method should be called only if the peer shuts down
diff --git a/examples/ASX/UPIPE_Event_Server/event_server.cpp b/examples/ASX/UPIPE_Event_Server/event_server.cpp
index 34b1d869d68..b7be9b5d44c 100644
--- a/examples/ASX/UPIPE_Event_Server/event_server.cpp
+++ b/examples/ASX/UPIPE_Event_Server/event_server.cpp
@@ -235,7 +235,7 @@ 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.
 
-  ACE_Reactor::run_event_loop();
+  ACE_Reactor::run_event_loop ();
 
   ACE_DEBUG ((LM_DEBUG, "main exiting\n"));
 
diff --git a/examples/Connection/blocking/SPIPE-acceptor.cpp b/examples/Connection/blocking/SPIPE-acceptor.cpp
index 5c2913029ed..a1548f39205 100644
--- a/examples/Connection/blocking/SPIPE-acceptor.cpp
+++ b/examples/Connection/blocking/SPIPE-acceptor.cpp
@@ -70,7 +70,7 @@ IPC_Server::init (int argc, char *argv[])
     ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "open"), 1);
 
   // Register to receive shutdowns.
-  else if (ACE_Reactor::instance()->register_handler
+  else if (ACE_Reactor::instance ()->register_handler
       (SIGINT, &this->done_handler_) == -1)
     return -1;
   else
@@ -126,7 +126,7 @@ run_reactor_event_loop (void *)
 	ACE_Thread_Control tc (ACE_Thread_Manager::instance ());
   ACE_DEBUG ((LM_DEBUG, "(%t) worker thread starting\n"));
 
-  ACE_Proactor::run_event_loop();
+  ACE_Proactor::run_event_loop ();
   return 0;
 }
 
diff --git a/examples/Connection/blocking/SPIPE-connector.cpp b/examples/Connection/blocking/SPIPE-connector.cpp
index fe29d5ce1ac..60ef04275ba 100644
--- a/examples/Connection/blocking/SPIPE-connector.cpp
+++ b/examples/Connection/blocking/SPIPE-connector.cpp
@@ -28,7 +28,7 @@ Peer_Handler::open (void *)
     {
       this->display_menu ();
       if (ACE::register_stdin_handler (this,
-				      ACE_Reactor::instance(),
+				      ACE_Reactor::instance (),
 					  ACE_Thread_Manager::instance ()) == -1)
 	ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "register_stdin_handler"), -1);
       else 
@@ -115,7 +115,7 @@ IPC_Client::init (int argc, char *argv[])
   if (this->parse_args (argc, argv) == -1)
     return -1;
   // Handle signals through the ACE_Reactor.
-  else if (ACE_Reactor::instance()->register_handler
+  else if (ACE_Reactor::instance ()->register_handler
 	   (SIGINT, &this->done_handler_) == -1)
     return -1;
 
@@ -147,7 +147,7 @@ IPC_Client::fini (void)
 int 
 IPC_Client::svc (void)
 {
-  ACE_Reactor::run_event_loop();
+  ACE_Reactor::run_event_loop ();
   return 0;
 }
 
diff --git a/examples/Connection/misc/Connection_Handler.cpp b/examples/Connection/misc/Connection_Handler.cpp
index 6a3599eb3aa..79141d9e1c2 100644
--- a/examples/Connection/misc/Connection_Handler.cpp
+++ b/examples/Connection/misc/Connection_Handler.cpp
@@ -115,7 +115,7 @@ Connection_Handler::svc (void)
     }
 
   // Cancel all pending timeouts.
-  ACE_Reactor::instance()->cancel_timer (this);
+  ACE_Reactor::instance ()->cancel_timer (this);
 
   // Remove ourselves from the Reactor.
   this->reactor ()->remove_handler 
@@ -219,7 +219,7 @@ main (int argc, char *argv[])
   // Perform connection service until we receive SIGINT.
 
   while (ACE_Reactor::event_loop_done() == 0)
-    ACE_Reactor::run_event_loop();
+    ACE_Reactor::run_event_loop ();
 
   ACE_DEBUG ((LM_DEBUG, " (%P|%t) shutting down connection server\n"));
 
diff --git a/examples/Connection/misc/test_upipe.cpp b/examples/Connection/misc/test_upipe.cpp
index ca4f367418d..fc782d1ed3d 100644
--- a/examples/Connection/misc/test_upipe.cpp
+++ b/examples/Connection/misc/test_upipe.cpp
@@ -157,7 +157,7 @@ int main (int argc, char *argv[])
   ACE_Thread_Manager thr_mgr;
 
   Client peer_connector (&thr_mgr);
-  Server peer_acceptor (&thr_mgr, ACE_Reactor::instance());
+  Server peer_acceptor (&thr_mgr, ACE_Reactor::instance ());
 
   // Establish the connection between Acceptor and Connector.
 
diff --git a/examples/Connection/non_blocking/CPP-acceptor.cpp b/examples/Connection/non_blocking/CPP-acceptor.cpp
index af9e05b2c5c..cdb0745c17a 100644
--- a/examples/Connection/non_blocking/CPP-acceptor.cpp
+++ b/examples/Connection/non_blocking/CPP-acceptor.cpp
@@ -90,16 +90,16 @@ IPC_Server<SH, PR_AC_2>::init (int argc, char *argv[])
     ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "set"), -1);
   // Call down to the ACCEPTOR's open() method to do the initialization.
   if (this->inherited::open (this->server_addr_, 
-			     use_reactor ? ACE_Reactor::instance() : 0) == -1)
+			     use_reactor ? ACE_Reactor::instance () : 0) == -1)
     ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "open"), -1);
 
   // Handle the SIGINT signal through the ACE_Reactor.
-  else if (ACE_Reactor::instance()->register_handler
+  else if (ACE_Reactor::instance ()->register_handler
 	   (SIGINT, &this->done_handler_) == -1)
     ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "register_handler"), -1);
 #if !defined (ACE_WIN32)
   // Handle the SIGPIPE signal through the ACE_Reactor.
-  else if (ACE_Reactor::instance()->register_handler 
+  else if (ACE_Reactor::instance ()->register_handler 
 	   (SIGPIPE, &this->done_handler_) == -1)
     ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "register_handler"), -1);
 #endif /* ACE_WIN32 */
diff --git a/examples/Connection/non_blocking/CPP-connector.cpp b/examples/Connection/non_blocking/CPP-connector.cpp
index f3bf738f408..03b75f063c5 100644
--- a/examples/Connection/non_blocking/CPP-connector.cpp
+++ b/examples/Connection/non_blocking/CPP-connector.cpp
@@ -152,7 +152,7 @@ template <class SH, PR_CO_1> int
 IPC_Client<SH, PR_CO_2>::svc (void)
 {
   if (this->reactor ())
-    ACE_Reactor::run_event_loop();
+    ACE_Reactor::run_event_loop ();
 
   return 0;
 }
@@ -173,7 +173,7 @@ template <class SH, PR_CO_1> int
 IPC_Client<SH, PR_CO_2>::init (int argc, char *argv[])
 {
   // Call down to the CONNECTOR's open() method to do the initialization.
-  this->inherited::open (ACE_Reactor::instance());
+  this->inherited::open (ACE_Reactor::instance ());
 
   char *r_addr = argc > 1 ? argv[1] : 
     ACE_SERVER_ADDRESS (ACE_DEFAULT_SERVER_HOST, 
@@ -184,7 +184,7 @@ IPC_Client<SH, PR_CO_2>::init (int argc, char *argv[])
   char *l_addr = argc > 3 ? argv[3] : ACE_DEFAULT_LOCAL_PORT_STR;
 
   // Handle signals through the ACE_Reactor.
-  if (ACE_Reactor::instance()->register_handler
+  if (ACE_Reactor::instance ()->register_handler
       (SIGINT, &this->done_handler_) == -1)
     ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "register_handler"), -1);
 
diff --git a/examples/IOStream/server/iostream_server.cpp b/examples/IOStream/server/iostream_server.cpp
index 3f6d0200f65..d0874f16503 100644
--- a/examples/IOStream/server/iostream_server.cpp
+++ b/examples/IOStream/server/iostream_server.cpp
@@ -121,7 +121,7 @@ main (int argc, char *argv [])
 
   // Register ourselves to receive SIGINT and SIGQUIT so we can shut
   // down gracefully via signals.
-  if (ACE_Reactor::instance()->register_handler (sig_set, &sa) == -1)
+  if (ACE_Reactor::instance ()->register_handler (sig_set, &sa) == -1)
     ACE_ERROR_RETURN ((LM_ERROR, "%p\n"), -1);
 
   Logging_Acceptor peer_acceptor ;
@@ -129,13 +129,13 @@ main (int argc, char *argv [])
   if (peer_acceptor.open (ACE_INET_Addr (argc > 1 ? atoi (argv[1]) : ACE_DEFAULT_SERVER_PORT)) == - 1)
     ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "open"), - 1);
 
-  else if (ACE_Reactor::instance()->register_handler 
+  else if (ACE_Reactor::instance ()->register_handler 
 	   (&peer_acceptor, ACE_Event_Handler::READ_MASK) == - 1) 
     ACE_ERROR_RETURN ((LM_ERROR, "registering service with ACE_Reactor\n"), - 1);
 	
   ACE_DEBUG ((LM_DEBUG, " (%P|%t) starting up daemon\n"));
 	
-  ACE_Reactor::run_event_loop();
+  ACE_Reactor::run_event_loop ();
 
   ACE_DEBUG ((LM_DEBUG, " (%P|%t) shutting down server daemon\n"));
 
diff --git a/examples/Logger/Acceptor-server/server_loggerd.cpp b/examples/Logger/Acceptor-server/server_loggerd.cpp
index 95b125be3ad..6649af76424 100644
--- a/examples/Logger/Acceptor-server/server_loggerd.cpp
+++ b/examples/Logger/Acceptor-server/server_loggerd.cpp
@@ -215,8 +215,8 @@ main (int argc, char *argv[])
 
   OPTIONS::instance ()->parse_args (argc, argv);
 
-  // We need to pass in REACTOR::instance() here so that we don't use
-  // the default ACE_Reactor::instance().
+  // We need to pass in REACTOR::instance () here so that we don't use
+  // the default ACE_Reactor::instance ().
 
   if (peer_acceptor.open 
       (ACE_INET_Addr (OPTIONS::instance ()->port ()),
diff --git a/examples/Misc/test_read_buffer.cpp b/examples/Misc/test_read_buffer.cpp
index 8c0c278933c..991bd41831b 100644
--- a/examples/Misc/test_read_buffer.cpp
+++ b/examples/Misc/test_read_buffer.cpp
@@ -18,7 +18,7 @@ main (int argc, char *argv[])
   while ((buf = rb.read (term, search, replace)) != 0)
     {
       ::write (1, buf, rb.size ());
-      ACE_Allocator::instance()->free (buf);
+      ACE_Allocator::instance ()->free (buf);
     }
   return 0;
 }
diff --git a/examples/Reactor/FIFO/server.cpp b/examples/Reactor/FIFO/server.cpp
index 88bb7e857a3..05ef9bd2c67 100644
--- a/examples/Reactor/FIFO/server.cpp
+++ b/examples/Reactor/FIFO/server.cpp
@@ -24,7 +24,7 @@ FIFO_Recv_Handler::FIFO_Recv_Handler (void)
     ACE_ERROR ((LM_ERROR, "%p\n", "open"));
 
   // Register with the Reactor.
-  if (ACE_Reactor::instance()->register_handler 
+  if (ACE_Reactor::instance ()->register_handler 
       (this, ACE_Event_Handler::READ_MASK) == -1)
     ACE_ERROR ((LM_ERROR, "%p\n", "register_handler"));
 }
@@ -74,7 +74,7 @@ main (int, char *argv[])
 
   FIFO_Recv_Handler fr_handler;
 
-  ACE_Reactor::run_event_loop();
+  ACE_Reactor::run_event_loop ();
 
   return 0;
 }
diff --git a/examples/Reactor/Misc/notification.cpp b/examples/Reactor/Misc/notification.cpp
index 3d7f6d403be..baa62217968 100644
--- a/examples/Reactor/Misc/notification.cpp
+++ b/examples/Reactor/Misc/notification.cpp
@@ -97,16 +97,16 @@ Thread_Handler::Thread_Handler (int delay,
   this->id_ = 0;
 
   if (ACE::register_stdin_handler (this,
-				   ACE_Reactor::instance(),
+				   ACE_Reactor::instance (),
 				   ACE_Thread_Manager::instance ()) == -1)
     ACE_ERROR ((LM_ERROR, "%p\n", "register_stdin_handler"));
 
 #if !defined(CHORUS)
-  else if (ACE_Reactor::instance()->register_handler (sig_set, this) == -1)
+  else if (ACE_Reactor::instance ()->register_handler (sig_set, this) == -1)
     ACE_ERROR ((LM_ERROR, "(%t) %p\n", "register_handler"));
 #endif
 
-  else if (ACE_Reactor::instance()->schedule_timer 
+  else if (ACE_Reactor::instance ()->schedule_timer 
       (this, 0, Thread_Handler::delay_, Thread_Handler::interval_) == -1)
     ACE_ERROR ((LM_ERROR, "(%t) %p\n", "schedule_timer"));
    
@@ -137,11 +137,11 @@ Thread_Handler::notify (ACE_Time_Value *timeout)
   // Just do something to test the ACE_Reactor's multi-thread
   // capabilities...
 
-  if (ACE_Reactor::instance()->notify 
+  if (ACE_Reactor::instance ()->notify 
       (this, ACE_Event_Handler::EXCEPT_MASK, timeout) == -1)
     ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p\n", 
 		       "notification::notify:exception"), -1);
-  else if (ACE_Reactor::instance()->notify 
+  else if (ACE_Reactor::instance ()->notify 
 	   (this, ACE_Event_Handler::WRITE_MASK, timeout) == -1)
     ACE_ERROR_RETURN ((LM_ERROR, "(%t) %p\n", 
 		       "notification::notify:write"), -1);
@@ -206,7 +206,7 @@ Thread_Handler::svc (void)
 	ACE_ERROR ((LM_ERROR, "(%t) %p\n", "notify"));
     }
 
-  ACE_Reactor::instance()->remove_handler(this, ALL_EVENTS_MASK);
+  ACE_Reactor::instance ()->remove_handler(this, ALL_EVENTS_MASK);
   ACE_DEBUG ((LM_DEBUG, "(%t) exiting svc\n"));
   return 0;
 }
@@ -289,7 +289,7 @@ main (int argc, char *argv[])
 
   Thread_Handler thr_handler (delay, interval, n_threads);
 
-  ACE_Reactor::run_event_loop();
+  ACE_Reactor::run_event_loop ();
   ACE_DEBUG ((LM_DEBUG, "exiting from main%a\n", 1));
   return 0;
 }
diff --git a/examples/Reactor/Misc/test_demuxing.cpp b/examples/Reactor/Misc/test_demuxing.cpp
index 0c51c75a2b1..8228529aa25 100644
--- a/examples/Reactor/Misc/test_demuxing.cpp
+++ b/examples/Reactor/Misc/test_demuxing.cpp
@@ -48,7 +48,7 @@ Sig_Handler::Sig_Handler (void)
   // Register signal handler object.  Note that NULL_MASK is used to
   // keep the ACE_Reactor from calling us back on the "/dev/null"
   // descriptor.
-  if (ACE_Reactor::instance()->register_handler 
+  if (ACE_Reactor::instance ()->register_handler 
       (this, ACE_Event_Handler::NULL_MASK) == -1)
     ACE_ERROR ((LM_ERROR, "%p\n%a", "register_handler", 1));
 
@@ -60,7 +60,7 @@ Sig_Handler::Sig_Handler (void)
   sig_set.sig_add (SIGALRM);  
 
   // Register the signal handler object to catch the signals.
-  if (ACE_Reactor::instance()->register_handler (sig_set, this) == -1)
+  if (ACE_Reactor::instance ()->register_handler (sig_set, this) == -1)
     ACE_ERROR ((LM_ERROR, "%p\n%a", "register_handler", 1));
 }
 
@@ -120,7 +120,7 @@ Sig_Handler::handle_signal (int signum, siginfo_t *, ucontext_t *)
       // this->handle_.  The ACE_Reactor will subsequently call the
       // <Sig_Handler::handle_input> method from within its event
       // loop.
-      return ACE_Reactor::instance()->ready_ops 
+      return ACE_Reactor::instance ()->ready_ops 
 	(this->handle_, ACE_Event_Handler::READ_MASK, ACE_Reactor::ADD_MASK);
     case SIGQUIT:
       ACE_DEBUG ((LM_DEBUG, "(%t) %S: shutting down signal tester\n", signum));
@@ -149,13 +149,13 @@ public:
 STDIN_Handler::STDIN_Handler (void)
 {
   if (ACE::register_stdin_handler (this,
-				   ACE_Reactor::instance(),
+				   ACE_Reactor::instance (),
 				   ACE_Thread_Manager::instance ()) == -1)
     ACE_ERROR ((LM_ERROR, "%p\n", "register_stdin_handler"));
 
   // Register the STDIN_Handler to be dispatched once every <timeout>
   // seconds.
-  else if (ACE_Reactor::instance()->schedule_timer
+  else if (ACE_Reactor::instance ()->schedule_timer
 	   (this, 0, ACE_Time_Value (timeout), ACE_Time_Value (timeout)) == -1)
     ACE_ERROR ((LM_ERROR, "%p\n%a", "schedule_timer", 1));
 }
@@ -221,7 +221,7 @@ private:
 };
 
 Message_Handler::Message_Handler (void)
-  : notification_strategy_ (ACE_Reactor::instance(),
+  : notification_strategy_ (ACE_Reactor::instance (),
 			    this,
 			    ACE_Event_Handler::READ_MASK)
 {
@@ -302,7 +302,7 @@ main (int argc, char *argv[])
   // Loop handling signals and I/O events until SIGQUIT occurs.
 
   while (ACE_Reactor::event_loop_done() == 0)
-    ACE_Reactor::run_event_loop();
+    ACE_Reactor::run_event_loop ();
 
   // Deactivate the message queue.
   mh.msg_queue ()->deactivate ();
diff --git a/examples/Reactor/Misc/test_reactors.cpp b/examples/Reactor/Misc/test_reactors.cpp
index 9f1069c6c21..36a1d02cbf1 100644
--- a/examples/Reactor/Misc/test_reactors.cpp
+++ b/examples/Reactor/Misc/test_reactors.cpp
@@ -157,7 +157,7 @@ worker (void *args)
 int 
 main (void)
 {
-  ACE_Reactor *react1 = ACE_Reactor::instance();
+  ACE_Reactor *react1 = ACE_Reactor::instance ();
   ACE_Reactor *react2 = new ACE_Reactor ();
   Test_Task tt1[MAX_TASKS];
   Test_Task tt2[MAX_TASKS];
diff --git a/examples/Reactor/Misc/test_signals_1.cpp b/examples/Reactor/Misc/test_signals_1.cpp
index 9081a364cdc..c4f65f912cc 100644
--- a/examples/Reactor/Misc/test_signals_1.cpp
+++ b/examples/Reactor/Misc/test_signals_1.cpp
@@ -73,7 +73,7 @@ main (int, char *argv[])
   ACE_DEBUG ((LM_DEBUG, 
 	      "starting event loop that runs until you've typed ^C a total of 10 times or ^\\ once.\n"));
 
-  int result = ACE_Reactor::run_event_loop();
+  int result = ACE_Reactor::run_event_loop ();
 
   ACE_DEBUG ((LM_DEBUG, "result = %d\n", result));
 
diff --git a/examples/Reactor/Ntalker/ntalker.cpp b/examples/Reactor/Ntalker/ntalker.cpp
index 4a0009f6804..48460960e4b 100644
--- a/examples/Reactor/Ntalker/ntalker.cpp
+++ b/examples/Reactor/Ntalker/ntalker.cpp
@@ -152,13 +152,13 @@ main (int argc, char *argv[])
 {
   parse_args (argc, argv);
 
-  Handler handler (UDP_PORT, MCAST_ADDR, INTERFACE, *ACE_Reactor::instance());
+  Handler handler (UDP_PORT, MCAST_ADDR, INTERFACE, *ACE_Reactor::instance ());
 
   ACE::register_stdin_handler (&handler,
-			       ACE_Reactor::instance(),
+			       ACE_Reactor::instance (),
 				   ACE_Thread_Manager::instance ());
 
-  ACE_Reactor::run_event_loop();
+  ACE_Reactor::run_event_loop ();
 
   cout << "\ntalker Done.\n";
   return 0;
diff --git a/examples/Reactor/Proactor/test_multiple_loops.cpp b/examples/Reactor/Proactor/test_multiple_loops.cpp
index 970ef0771f1..9ebf33add8a 100644
--- a/examples/Reactor/Proactor/test_multiple_loops.cpp
+++ b/examples/Reactor/Proactor/test_multiple_loops.cpp
@@ -67,7 +67,7 @@ public:
     ACE_Time_Value run_time (13);
 
     // Try to become the owner
-    ACE_ReactorEx::instance()->owner (ACE_Thread::self ());
+    ACE_ReactorEx::instance ()->owner (ACE_Thread::self ());
 
     if (ACE_ReactorEx::run_event_loop (run_time) == -1)
       ACE_ERROR_RETURN ((LM_ERROR, "%p.\n", "Worker::svc"), -1);
@@ -84,7 +84,7 @@ main (void)
   Timeout_Handler handler;
   ACE_Proactor proactor (0, 0, 1);
 
-  ACE_ReactorEx::instance()->register_handler (&proactor);
+  ACE_ReactorEx::instance ()->register_handler (&proactor);
   
   // Register a 2 second timer.
   ACE_Time_Value foo_tv (2);
@@ -96,7 +96,7 @@ main (void)
 
   // Register a 3 second timer.
   ACE_Time_Value bar_tv (3);
-  if (ACE_ReactorEx::instance()->schedule_timer (&handler,
+  if (ACE_ReactorEx::instance ()->schedule_timer (&handler,
 							(void *) "ReactorEx",
 							ACE_Time_Value::zero,
 							bar_tv) == -1)
diff --git a/examples/Reactor/Proactor/test_proactor.cpp b/examples/Reactor/Proactor/test_proactor.cpp
index 056d183a893..6452b39361c 100644
--- a/examples/Reactor/Proactor/test_proactor.cpp
+++ b/examples/Reactor/Proactor/test_proactor.cpp
@@ -544,7 +544,7 @@ main (int argc, char *argv[])
 
   while (!error && !done)
     // dispatch events
-    error = ACE_Proactor::instance()->handle_events ();
+    error = ACE_Proactor::instance ()->handle_events ();
   
   return 0;
 }
diff --git a/examples/Reactor/Proactor/test_timeout.cpp b/examples/Reactor/Proactor/test_timeout.cpp
index 38cafa19341..cfebe8a13cd 100644
--- a/examples/Reactor/Proactor/test_timeout.cpp
+++ b/examples/Reactor/Proactor/test_timeout.cpp
@@ -72,7 +72,7 @@ main (void)
 
   // Register a 2 second timer.
   ACE_Time_Value foo_tv (2);
-  if (ACE_Proactor::instance()->schedule_timer (handler,
+  if (ACE_Proactor::instance ()->schedule_timer (handler,
 						       (void *) "Foo",
 						       ACE_Time_Value::zero,
 						       foo_tv) == -1)
@@ -80,7 +80,7 @@ main (void)
 
   // Register a 3 second timer.
   ACE_Time_Value bar_tv (3);
-  if (ACE_Proactor::instance()->schedule_timer (handler,
+  if (ACE_Proactor::instance ()->schedule_timer (handler,
 						       (void *) "Bar",
 						       ACE_Time_Value::zero,
 						       bar_tv) == -1)
diff --git a/examples/Reactor/ReactorEx/test_MT.cpp b/examples/Reactor/ReactorEx/test_MT.cpp
index d50dd235e80..5d346880938 100644
--- a/examples/Reactor/ReactorEx/test_MT.cpp
+++ b/examples/Reactor/ReactorEx/test_MT.cpp
@@ -108,9 +108,9 @@ int
 Task_Handler::svc (void)
 {
   // Try to become the owner
-  ACE_ReactorEx::instance()->owner (ACE_Thread::self ());
+  ACE_ReactorEx::instance ()->owner (ACE_Thread::self ());
   // Run the event loop.
-  return ACE_ReactorEx::run_event_loop();
+  return ACE_ReactorEx::run_event_loop ();
 }
 
 Task_Handler::Task_Handler (size_t number_of_handles,
@@ -120,7 +120,7 @@ Task_Handler::Task_Handler (size_t number_of_handles,
 
   for (size_t i = 0; i < number_of_handles; i++)
     {
-      if (ACE_ReactorEx::instance()->register_handler (this,
+      if (ACE_ReactorEx::instance ()->register_handler (this,
 							      this->events_[i].handle ()) == -1)
 	ACE_ERROR ((LM_ERROR, "%p\t cannot register handle %d with ReactorEx\n", 
 		    "Task_Handler::Task_Handler", i));      
@@ -146,14 +146,14 @@ Task_Handler::handle_signal (int signum, siginfo_t *siginfo, ucontext_t *)
   ACE_DEBUG ((LM_DEBUG, "(%t) handle_signal() called: handle value = %d\n", 
 	      siginfo->si_handle_));
 
-  if (ACE_ReactorEx::instance()->remove_handler (siginfo->si_handle_,
+  if (ACE_ReactorEx::instance ()->remove_handler (siginfo->si_handle_,
 							ACE_Event_Handler::DONT_CALL) == -1)
     ACE_ERROR_RETURN ((LM_ERROR, 
 		       "(%t) %p\tTask cannot be unregistered from ReactorEx: handle value = %d\n", 
 		       "Task_Handler::handle_signal",
 		       siginfo->si_handle_), -1);
   
-  if (ACE_ReactorEx::instance()->register_handler (this,
+  if (ACE_ReactorEx::instance ()->register_handler (this,
 							  siginfo->si_handle_) == -1)
     ACE_ERROR_RETURN ((LM_ERROR, 
 		       "(%t) %p\tTask cannot be registered with ReactorEx: handle value = %d\n",  
@@ -208,7 +208,7 @@ main (int argc, char **argv)
       ACE_DEBUG ((LM_DEBUG, "********************************************************\n"));		
 
       // Setup a timer for the task
-      if (ACE_ReactorEx::instance()->schedule_timer (&task,
+      if (ACE_ReactorEx::instance ()->schedule_timer (&task,
 							    (void *) i,
 							    0) == -1)
 	ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "schedule_timer"), -1);
@@ -222,7 +222,7 @@ main (int argc, char **argv)
   ACE_OS::sleep (interval);
 
   // Close ReactorEx
-  ACE_ReactorEx::instance()->close ();
+  ACE_ReactorEx::instance ()->close ();
 
   // Wait for all threads to exit 
   ACE_Thread_Manager::instance ()->wait ();
diff --git a/examples/Reactor/ReactorEx/test_exceptions.cpp b/examples/Reactor/ReactorEx/test_exceptions.cpp
index 2f687ebb296..7aef018fcc5 100644
--- a/examples/Reactor/ReactorEx/test_exceptions.cpp
+++ b/examples/Reactor/ReactorEx/test_exceptions.cpp
@@ -34,17 +34,17 @@ public:
     for (int i = 1; i <= 10; i++)
       {
 	ACE_DEBUG ((LM_DEBUG, "Active threads in ReactorEx (before handle_events) = %d\n", 
-		    ACE_ReactorEx::instance()->active_threads_));
+		    ACE_ReactorEx::instance ()->active_threads_));
 	ACE_SEH_TRY 
 	  {
-	    ACE_ReactorEx::instance()->handle_events ();
+	    ACE_ReactorEx::instance ()->handle_events ();
 	  }
 	ACE_SEH_EXCEPT (EXCEPTION_EXECUTE_HANDLER)
 	  {
 	    ACE_DEBUG ((LM_DEBUG, "Exception occurred\n"));
 	  }
 	ACE_DEBUG ((LM_DEBUG, "Active threads in ReactorEx (after handle_events) = %d\n", 
-		    ACE_ReactorEx::instance()->active_threads_));
+		    ACE_ReactorEx::instance ()->active_threads_));
       }
   }
 };
@@ -54,7 +54,7 @@ main ()
 {
   Event_Handler *handler;
   ACE_NEW_RETURN (handler, Event_Handler, -1);
-  ACE_ReactorEx::instance()->register_handler (handler);
+  ACE_ReactorEx::instance ()->register_handler (handler);
   ACE_ReactorEx_Test::doit ();
   delete handler;
   return 0;
diff --git a/examples/Reactor/ReactorEx/test_reactorEx.cpp b/examples/Reactor/ReactorEx/test_reactorEx.cpp
index d4a7c9cfd07..0ca4563ea25 100644
--- a/examples/Reactor/ReactorEx/test_reactorEx.cpp
+++ b/examples/Reactor/ReactorEx/test_reactorEx.cpp
@@ -132,7 +132,7 @@ private:
 Peer_Handler::Peer_Handler (int argc, char *argv[])
   : host_ (0),
     port_ (ACE_DEFAULT_SERVER_PORT),
-    strategy_ (ACE_ReactorEx::instance(), 
+    strategy_ (ACE_ReactorEx::instance (), 
 	       this, 
 	       ACE_Event_Handler::WRITE_MASK)
 {
@@ -192,7 +192,7 @@ Peer_Handler::open (void *)
       ACE_DEBUG ((LM_DEBUG, "accepted.\n"));
     }
 
-  return ACE_Proactor::instance()->initiate 
+  return ACE_Proactor::instance ()->initiate 
     (this, ACE_Event_Handler::READ_MASK);
 }
 
@@ -281,7 +281,7 @@ Peer_Handler::handle_output (ACE_HANDLE fd)
   // Forward the message to the remote peer receiver.
   if (this->getq (mb, &tv) != -1)
     {
-      if (ACE_Proactor::instance()->
+      if (ACE_Proactor::instance ()->
 	  initiate (this, ACE_Event_Handler::WRITE_MASK, mb) == -1)
 	ACE_ERROR ((LM_ERROR, "%p Write initiate.\n", "Peer_Handler"));
     }
@@ -373,13 +373,13 @@ STDIN_Handler::register_thread_exit_hook (void)
 
   // Register ourselves to get called back when our thread exits.
 
-  if (ACE_ReactorEx::instance()->
+  if (ACE_ReactorEx::instance ()->
       register_handler (this, this->thr_handle_) == -1)
     ACE_ERROR ((LM_ERROR, "Exit_Hook Register failed.\n"));
 
   // We're in another thread, so we need to notify the ReactorEx so
   // that it wakes up and waits on the new set of handles.
-  ACE_ReactorEx::instance()->notify ();
+  ACE_ReactorEx::instance ()->notify ();
 }
 
 // The STDIN thread has exited.  This means the user hit ^C.  We can
@@ -417,13 +417,13 @@ main (int argc, char *argv[])
 
   // Register proactor with ReactorEx so that we can demultiplex
   // "waitable" events and I/O operations from a single thread.
-  if (ACE_ReactorEx::instance()->register_handler 
-      (ACE_Proactor::instance()) != 0)
+  if (ACE_ReactorEx::instance ()->register_handler 
+      (ACE_Proactor::instance ()) != 0)
     ACE_ERROR_RETURN ((LM_ERROR, "%p failed to register Proactor.\n",
 		       argv[0]), -1);
 
   // Run main event demultiplexor.
-  ACE_ReactorEx::run_event_loop();
+  ACE_ReactorEx::run_event_loop ();
 
   return 0;
 }
diff --git a/examples/Reactor/ReactorEx/test_remove_handler.cpp b/examples/Reactor/ReactorEx/test_remove_handler.cpp
index 85dc9fbbade..5a8aa0e6649 100644
--- a/examples/Reactor/ReactorEx/test_remove_handler.cpp
+++ b/examples/Reactor/ReactorEx/test_remove_handler.cpp
@@ -37,7 +37,7 @@ public:
     : event_number_ (event_number),
       close_down_ (close_down)
     {
-      if (ACE_ReactorEx::instance()->register_handler (this,
+      if (ACE_ReactorEx::instance ()->register_handler (this,
 							      this->event_.handle ()) == -1)
 	ACE_ERROR ((LM_ERROR, "%p\tevent handler %d cannot be added to ReactorEx\n", "", event_number_));
       this->event_.signal ();
@@ -88,7 +88,7 @@ main (int argc, char *argv[])
   ACE_Time_Value time (1);
   while (1)
     {
-      result = ACE_ReactorEx::instance()->handle_events (time);
+      result = ACE_ReactorEx::instance ()->handle_events (time);
       if (result == 0 && errno == ETIME)
 	{
 	  ACE_DEBUG ((LM_DEBUG, "No more work left: timing out\n"));
diff --git a/examples/Reactor/ReactorEx/test_timeout.cpp b/examples/Reactor/ReactorEx/test_timeout.cpp
index f1adf29e04d..93e081653a3 100644
--- a/examples/Reactor/ReactorEx/test_timeout.cpp
+++ b/examples/Reactor/ReactorEx/test_timeout.cpp
@@ -53,13 +53,13 @@ main (void)
 
   // Register a 2 second timer.
   ACE_Time_Value foo_tv (2);
-  ACE_ReactorEx::instance()->schedule_timer (&handler,
+  ACE_ReactorEx::instance ()->schedule_timer (&handler,
 						    (void *) "Foo",
 						    ACE_Time_Value::zero,
 						    foo_tv);
   // Register a 3 second timer.
   ACE_Time_Value bar_tv (3);
-  ACE_ReactorEx::instance()->schedule_timer (&handler,
+  ACE_ReactorEx::instance ()->schedule_timer (&handler,
 						    (void *) "Bar",
 						    ACE_Time_Value::zero,
 						    bar_tv);
diff --git a/examples/Reactor/WFMO_Reactor/test_MT.cpp b/examples/Reactor/WFMO_Reactor/test_MT.cpp
index d50dd235e80..5d346880938 100644
--- a/examples/Reactor/WFMO_Reactor/test_MT.cpp
+++ b/examples/Reactor/WFMO_Reactor/test_MT.cpp
@@ -108,9 +108,9 @@ int
 Task_Handler::svc (void)
 {
   // Try to become the owner
-  ACE_ReactorEx::instance()->owner (ACE_Thread::self ());
+  ACE_ReactorEx::instance ()->owner (ACE_Thread::self ());
   // Run the event loop.
-  return ACE_ReactorEx::run_event_loop();
+  return ACE_ReactorEx::run_event_loop ();
 }
 
 Task_Handler::Task_Handler (size_t number_of_handles,
@@ -120,7 +120,7 @@ Task_Handler::Task_Handler (size_t number_of_handles,
 
   for (size_t i = 0; i < number_of_handles; i++)
     {
-      if (ACE_ReactorEx::instance()->register_handler (this,
+      if (ACE_ReactorEx::instance ()->register_handler (this,
 							      this->events_[i].handle ()) == -1)
 	ACE_ERROR ((LM_ERROR, "%p\t cannot register handle %d with ReactorEx\n", 
 		    "Task_Handler::Task_Handler", i));      
@@ -146,14 +146,14 @@ Task_Handler::handle_signal (int signum, siginfo_t *siginfo, ucontext_t *)
   ACE_DEBUG ((LM_DEBUG, "(%t) handle_signal() called: handle value = %d\n", 
 	      siginfo->si_handle_));
 
-  if (ACE_ReactorEx::instance()->remove_handler (siginfo->si_handle_,
+  if (ACE_ReactorEx::instance ()->remove_handler (siginfo->si_handle_,
 							ACE_Event_Handler::DONT_CALL) == -1)
     ACE_ERROR_RETURN ((LM_ERROR, 
 		       "(%t) %p\tTask cannot be unregistered from ReactorEx: handle value = %d\n", 
 		       "Task_Handler::handle_signal",
 		       siginfo->si_handle_), -1);
   
-  if (ACE_ReactorEx::instance()->register_handler (this,
+  if (ACE_ReactorEx::instance ()->register_handler (this,
 							  siginfo->si_handle_) == -1)
     ACE_ERROR_RETURN ((LM_ERROR, 
 		       "(%t) %p\tTask cannot be registered with ReactorEx: handle value = %d\n",  
@@ -208,7 +208,7 @@ main (int argc, char **argv)
       ACE_DEBUG ((LM_DEBUG, "********************************************************\n"));		
 
       // Setup a timer for the task
-      if (ACE_ReactorEx::instance()->schedule_timer (&task,
+      if (ACE_ReactorEx::instance ()->schedule_timer (&task,
 							    (void *) i,
 							    0) == -1)
 	ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "schedule_timer"), -1);
@@ -222,7 +222,7 @@ main (int argc, char **argv)
   ACE_OS::sleep (interval);
 
   // Close ReactorEx
-  ACE_ReactorEx::instance()->close ();
+  ACE_ReactorEx::instance ()->close ();
 
   // Wait for all threads to exit 
   ACE_Thread_Manager::instance ()->wait ();
diff --git a/examples/Reactor/WFMO_Reactor/test_exceptions.cpp b/examples/Reactor/WFMO_Reactor/test_exceptions.cpp
index 2f687ebb296..7aef018fcc5 100644
--- a/examples/Reactor/WFMO_Reactor/test_exceptions.cpp
+++ b/examples/Reactor/WFMO_Reactor/test_exceptions.cpp
@@ -34,17 +34,17 @@ public:
     for (int i = 1; i <= 10; i++)
       {
 	ACE_DEBUG ((LM_DEBUG, "Active threads in ReactorEx (before handle_events) = %d\n", 
-		    ACE_ReactorEx::instance()->active_threads_));
+		    ACE_ReactorEx::instance ()->active_threads_));
 	ACE_SEH_TRY 
 	  {
-	    ACE_ReactorEx::instance()->handle_events ();
+	    ACE_ReactorEx::instance ()->handle_events ();
 	  }
 	ACE_SEH_EXCEPT (EXCEPTION_EXECUTE_HANDLER)
 	  {
 	    ACE_DEBUG ((LM_DEBUG, "Exception occurred\n"));
 	  }
 	ACE_DEBUG ((LM_DEBUG, "Active threads in ReactorEx (after handle_events) = %d\n", 
-		    ACE_ReactorEx::instance()->active_threads_));
+		    ACE_ReactorEx::instance ()->active_threads_));
       }
   }
 };
@@ -54,7 +54,7 @@ main ()
 {
   Event_Handler *handler;
   ACE_NEW_RETURN (handler, Event_Handler, -1);
-  ACE_ReactorEx::instance()->register_handler (handler);
+  ACE_ReactorEx::instance ()->register_handler (handler);
   ACE_ReactorEx_Test::doit ();
   delete handler;
   return 0;
diff --git a/examples/Reactor/WFMO_Reactor/test_reactorEx.cpp b/examples/Reactor/WFMO_Reactor/test_reactorEx.cpp
index d4a7c9cfd07..0ca4563ea25 100644
--- a/examples/Reactor/WFMO_Reactor/test_reactorEx.cpp
+++ b/examples/Reactor/WFMO_Reactor/test_reactorEx.cpp
@@ -132,7 +132,7 @@ private:
 Peer_Handler::Peer_Handler (int argc, char *argv[])
   : host_ (0),
     port_ (ACE_DEFAULT_SERVER_PORT),
-    strategy_ (ACE_ReactorEx::instance(), 
+    strategy_ (ACE_ReactorEx::instance (), 
 	       this, 
 	       ACE_Event_Handler::WRITE_MASK)
 {
@@ -192,7 +192,7 @@ Peer_Handler::open (void *)
       ACE_DEBUG ((LM_DEBUG, "accepted.\n"));
     }
 
-  return ACE_Proactor::instance()->initiate 
+  return ACE_Proactor::instance ()->initiate 
     (this, ACE_Event_Handler::READ_MASK);
 }
 
@@ -281,7 +281,7 @@ Peer_Handler::handle_output (ACE_HANDLE fd)
   // Forward the message to the remote peer receiver.
   if (this->getq (mb, &tv) != -1)
     {
-      if (ACE_Proactor::instance()->
+      if (ACE_Proactor::instance ()->
 	  initiate (this, ACE_Event_Handler::WRITE_MASK, mb) == -1)
 	ACE_ERROR ((LM_ERROR, "%p Write initiate.\n", "Peer_Handler"));
     }
@@ -373,13 +373,13 @@ STDIN_Handler::register_thread_exit_hook (void)
 
   // Register ourselves to get called back when our thread exits.
 
-  if (ACE_ReactorEx::instance()->
+  if (ACE_ReactorEx::instance ()->
       register_handler (this, this->thr_handle_) == -1)
     ACE_ERROR ((LM_ERROR, "Exit_Hook Register failed.\n"));
 
   // We're in another thread, so we need to notify the ReactorEx so
   // that it wakes up and waits on the new set of handles.
-  ACE_ReactorEx::instance()->notify ();
+  ACE_ReactorEx::instance ()->notify ();
 }
 
 // The STDIN thread has exited.  This means the user hit ^C.  We can
@@ -417,13 +417,13 @@ main (int argc, char *argv[])
 
   // Register proactor with ReactorEx so that we can demultiplex
   // "waitable" events and I/O operations from a single thread.
-  if (ACE_ReactorEx::instance()->register_handler 
-      (ACE_Proactor::instance()) != 0)
+  if (ACE_ReactorEx::instance ()->register_handler 
+      (ACE_Proactor::instance ()) != 0)
     ACE_ERROR_RETURN ((LM_ERROR, "%p failed to register Proactor.\n",
 		       argv[0]), -1);
 
   // Run main event demultiplexor.
-  ACE_ReactorEx::run_event_loop();
+  ACE_ReactorEx::run_event_loop ();
 
   return 0;
 }
diff --git a/examples/Reactor/WFMO_Reactor/test_remove_handler.cpp b/examples/Reactor/WFMO_Reactor/test_remove_handler.cpp
index 85dc9fbbade..5a8aa0e6649 100644
--- a/examples/Reactor/WFMO_Reactor/test_remove_handler.cpp
+++ b/examples/Reactor/WFMO_Reactor/test_remove_handler.cpp
@@ -37,7 +37,7 @@ public:
     : event_number_ (event_number),
       close_down_ (close_down)
     {
-      if (ACE_ReactorEx::instance()->register_handler (this,
+      if (ACE_ReactorEx::instance ()->register_handler (this,
 							      this->event_.handle ()) == -1)
 	ACE_ERROR ((LM_ERROR, "%p\tevent handler %d cannot be added to ReactorEx\n", "", event_number_));
       this->event_.signal ();
@@ -88,7 +88,7 @@ main (int argc, char *argv[])
   ACE_Time_Value time (1);
   while (1)
     {
-      result = ACE_ReactorEx::instance()->handle_events (time);
+      result = ACE_ReactorEx::instance ()->handle_events (time);
       if (result == 0 && errno == ETIME)
 	{
 	  ACE_DEBUG ((LM_DEBUG, "No more work left: timing out\n"));
diff --git a/examples/Reactor/WFMO_Reactor/test_timeout.cpp b/examples/Reactor/WFMO_Reactor/test_timeout.cpp
index f1adf29e04d..93e081653a3 100644
--- a/examples/Reactor/WFMO_Reactor/test_timeout.cpp
+++ b/examples/Reactor/WFMO_Reactor/test_timeout.cpp
@@ -53,13 +53,13 @@ main (void)
 
   // Register a 2 second timer.
   ACE_Time_Value foo_tv (2);
-  ACE_ReactorEx::instance()->schedule_timer (&handler,
+  ACE_ReactorEx::instance ()->schedule_timer (&handler,
 						    (void *) "Foo",
 						    ACE_Time_Value::zero,
 						    foo_tv);
   // Register a 3 second timer.
   ACE_Time_Value bar_tv (3);
-  ACE_ReactorEx::instance()->schedule_timer (&handler,
+  ACE_ReactorEx::instance ()->schedule_timer (&handler,
 						    (void *) "Bar",
 						    ACE_Time_Value::zero,
 						    bar_tv);
diff --git a/examples/Service_Configurator/IPC-tests/server/Handle_Broadcast.i b/examples/Service_Configurator/IPC-tests/server/Handle_Broadcast.i
index 11c30e02fec..14de88bce6e 100644
--- a/examples/Service_Configurator/IPC-tests/server/Handle_Broadcast.i
+++ b/examples/Service_Configurator/IPC-tests/server/Handle_Broadcast.i
@@ -61,7 +61,7 @@ Handle_Broadcast::init (int argc, char *argv[])
   
   if (this->open (sba) == -1)
     ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "open"), -1);
-  else if (ACE_Reactor::instance()->register_handler 
+  else if (ACE_Reactor::instance ()->register_handler 
 	   (this, ACE_Event_Handler::ACCEPT_MASK) == -1)
     ACE_ERROR_RETURN ((LM_ERROR, "registering service with ACE_Reactor\n"), -1);
   return 0;
@@ -70,7 +70,7 @@ Handle_Broadcast::init (int argc, char *argv[])
 ACE_INLINE int 
 Handle_Broadcast::fini (void) 
 {
-  return ACE_Reactor::instance()->remove_handler 
+  return ACE_Reactor::instance ()->remove_handler 
     (this, ACE_Event_Handler::ACCEPT_MASK);
 }
 
diff --git a/examples/Service_Configurator/IPC-tests/server/Handle_L_CODgram.i b/examples/Service_Configurator/IPC-tests/server/Handle_L_CODgram.i
index e30f506122a..735ca3fd066 100644
--- a/examples/Service_Configurator/IPC-tests/server/Handle_L_CODgram.i
+++ b/examples/Service_Configurator/IPC-tests/server/Handle_L_CODgram.i
@@ -61,7 +61,7 @@ Handle_L_CODgram::init (int argc, char *argv[])
   sucd.set (this->rendezvous);
   if (this->open (sucd) == -1)
     ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "open"), -1);
-  else if (ACE_Reactor::instance()->register_handler 
+  else if (ACE_Reactor::instance ()->register_handler 
 	   (this, ACE_Event_Handler::ACCEPT_MASK) == -1)
     ACE_ERROR_RETURN ((LM_ERROR, 
 		       "registering service with ACE_Reactor\n"), -1);
@@ -71,7 +71,7 @@ Handle_L_CODgram::init (int argc, char *argv[])
 ACE_INLINE int 
 Handle_L_CODgram::fini(void) 
 {
-  return ACE_Reactor::instance()->remove_handler 
+  return ACE_Reactor::instance ()->remove_handler 
     (this, ACE_Event_Handler::ACCEPT_MASK);
 }
 
diff --git a/examples/Service_Configurator/IPC-tests/server/Handle_L_Dgram.i b/examples/Service_Configurator/IPC-tests/server/Handle_L_Dgram.i
index aaa6e97f18a..adbb9be45e5 100644
--- a/examples/Service_Configurator/IPC-tests/server/Handle_L_Dgram.i
+++ b/examples/Service_Configurator/IPC-tests/server/Handle_L_Dgram.i
@@ -60,7 +60,7 @@ Handle_L_Dgram::init (int argc, char *argv[])
   sudg.set (this->rendezvous);
   if (this->open (sudg) == -1)
     ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "open"), -1);
-  else if (ACE_Reactor::instance()->register_handler (this,
+  else if (ACE_Reactor::instance ()->register_handler (this,
 						      ACE_Event_Handler::ACCEPT_MASK) == -1)
     ACE_ERROR_RETURN ((LM_ERROR, "registering service with ACE_Reactor\n"), -1);
   return 0;
@@ -69,7 +69,7 @@ Handle_L_Dgram::init (int argc, char *argv[])
 ACE_INLINE int 
 Handle_L_Dgram::fini (void) 
 {
-  return ACE_Reactor::instance()->remove_handler (this, ACE_Event_Handler::ACCEPT_MASK);
+  return ACE_Reactor::instance ()->remove_handler (this, ACE_Event_Handler::ACCEPT_MASK);
 }
 
 ACE_INLINE int 
diff --git a/examples/Service_Configurator/IPC-tests/server/Handle_L_FIFO.i b/examples/Service_Configurator/IPC-tests/server/Handle_L_FIFO.i
index 377afb33845..b70e8002c32 100644
--- a/examples/Service_Configurator/IPC-tests/server/Handle_L_FIFO.i
+++ b/examples/Service_Configurator/IPC-tests/server/Handle_L_FIFO.i
@@ -54,7 +54,7 @@ Handle_L_FIFO::init (int argc, char *argv[])
   ACE_OS::unlink (rendezvous_fifo);
   if (this->open (rendezvous_fifo) == -1)
     ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "open"), -1);
-  else if (ACE_Reactor::instance()->register_handler 
+  else if (ACE_Reactor::instance ()->register_handler 
 	   (this, ACE_Event_Handler::READ_MASK) == -1)
     ACE_ERROR_RETURN ((LM_ERROR, "registering service with ACE_Reactor\n"), -1);
   return 0;
@@ -63,7 +63,7 @@ Handle_L_FIFO::init (int argc, char *argv[])
 ACE_INLINE int 
 Handle_L_FIFO::fini (void) 
 {
-  return ACE_Reactor::instance()->remove_handler 
+  return ACE_Reactor::instance ()->remove_handler 
     (this, ACE_Event_Handler::ACCEPT_MASK);
 }
 
diff --git a/examples/Service_Configurator/IPC-tests/server/Handle_L_Pipe.i b/examples/Service_Configurator/IPC-tests/server/Handle_L_Pipe.i
index 39e38a82ef8..b8c93ff25f5 100644
--- a/examples/Service_Configurator/IPC-tests/server/Handle_L_Pipe.i
+++ b/examples/Service_Configurator/IPC-tests/server/Handle_L_Pipe.i
@@ -76,7 +76,7 @@ Handle_L_Pipe::init (int argc, char *argv[])
   sup.set (this->rendezvous);
   if (this->open (sup) == -1)
     ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "open"), -1);
-  else if (ACE_Reactor::instance()->register_handler 
+  else if (ACE_Reactor::instance ()->register_handler 
 	   (this, ACE_Event_Handler::ACCEPT_MASK) == -1)
     ACE_ERROR_RETURN ((LM_ERROR, 
 		       "registering service with ACE_Reactor\n"), -1);
@@ -86,7 +86,7 @@ Handle_L_Pipe::init (int argc, char *argv[])
 ACE_INLINE int 
 Handle_L_Pipe::fini (void) 
 {
-  return ACE_Reactor::instance()->remove_handler 
+  return ACE_Reactor::instance ()->remove_handler 
     (this, ACE_Event_Handler::ACCEPT_MASK);
 }
 
diff --git a/examples/Service_Configurator/IPC-tests/server/Handle_L_SPIPE.i b/examples/Service_Configurator/IPC-tests/server/Handle_L_SPIPE.i
index 47c45f9600e..b3cb6005b58 100644
--- a/examples/Service_Configurator/IPC-tests/server/Handle_L_SPIPE.i
+++ b/examples/Service_Configurator/IPC-tests/server/Handle_L_SPIPE.i
@@ -60,7 +60,7 @@ Handle_L_SPIPE::init (int argc, char *argv[])
   susp.set (rendezvous);
   if (this->open (susp) == -1)
     ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "open"), -1);
-  else if (ACE_Reactor::instance()->register_handler 
+  else if (ACE_Reactor::instance ()->register_handler 
 	   (this, ACE_Event_Handler::ACCEPT_MASK) == -1)
     ACE_ERROR_RETURN ((LM_ERROR, "registering service with ACE_Reactor\n"), -1);
   return 0;
@@ -69,7 +69,7 @@ Handle_L_SPIPE::init (int argc, char *argv[])
 ACE_INLINE int 
 Handle_L_SPIPE::fini (void) 
 {
-  return ACE_Reactor::instance()->remove_handler 
+  return ACE_Reactor::instance ()->remove_handler 
     (this, ACE_Event_Handler::ACCEPT_MASK);
 }
 
diff --git a/examples/Service_Configurator/IPC-tests/server/Handle_L_Stream.i b/examples/Service_Configurator/IPC-tests/server/Handle_L_Stream.i
index 7ecb6acc8cd..d3d4933ee69 100644
--- a/examples/Service_Configurator/IPC-tests/server/Handle_L_Stream.i
+++ b/examples/Service_Configurator/IPC-tests/server/Handle_L_Stream.i
@@ -70,7 +70,7 @@ Handle_L_Stream::init (int argc, char *argv[])
 
   if (this->open (sus) == -1)
     ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "open"), -1);
-  else if (ACE_Reactor::instance()->register_handler 
+  else if (ACE_Reactor::instance ()->register_handler 
 	   (this, ACE_Event_Handler::ACCEPT_MASK) == -1)
     ACE_ERROR_RETURN ((LM_ERROR, 
 		       "registering service with ACE_Reactor\n"), -1);
@@ -80,7 +80,7 @@ Handle_L_Stream::init (int argc, char *argv[])
 ACE_INLINE int 
 Handle_L_Stream::fini (void) 
 {
-  return ACE_Reactor::instance()->remove_handler 
+  return ACE_Reactor::instance ()->remove_handler 
     (this, ACE_Event_Handler::ACCEPT_MASK);
 }
 
diff --git a/examples/Service_Configurator/IPC-tests/server/Handle_R_Dgram.i b/examples/Service_Configurator/IPC-tests/server/Handle_R_Dgram.i
index 2f3c83431c1..1112125956f 100644
--- a/examples/Service_Configurator/IPC-tests/server/Handle_R_Dgram.i
+++ b/examples/Service_Configurator/IPC-tests/server/Handle_R_Dgram.i
@@ -56,7 +56,7 @@ Handle_R_Dgram::init (int argc, char *argv[])
   
   if (this->open (sidg) == -1)
     ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "open"), -1);
-  else if (ACE_Reactor::instance()->register_handler 
+  else if (ACE_Reactor::instance ()->register_handler 
 	   (this, ACE_Event_Handler::ACCEPT_MASK) == -1)
     ACE_ERROR_RETURN ((LM_ERROR, "registering service with ACE_Reactor\n"), -1);
   return 0;
@@ -65,7 +65,7 @@ Handle_R_Dgram::init (int argc, char *argv[])
 ACE_INLINE int 
 Handle_R_Dgram::fini (void) 
 {
-  return ACE_Reactor::instance()->remove_handler 
+  return ACE_Reactor::instance ()->remove_handler 
     (this, ACE_Event_Handler::ACCEPT_MASK);
 }
 
diff --git a/examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.i b/examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.i
index 59c65dc8cda..a925df264e1 100644
--- a/examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.i
+++ b/examples/Service_Configurator/IPC-tests/server/Handle_R_Stream.i
@@ -58,7 +58,7 @@ Handle_R_Stream::init (int argc, char *argv[])
   
   if (this->open (sis) == -1)
     ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "open"), -1);
-  else if (ACE_Reactor::instance()->register_handler 
+  else if (ACE_Reactor::instance ()->register_handler 
 	   (this, ACE_Event_Handler::ACCEPT_MASK) == -1)
     ACE_ERROR_RETURN ((LM_ERROR, "registering service with ACE_Reactor\n"), -1);
   return 0;
@@ -67,7 +67,7 @@ Handle_R_Stream::init (int argc, char *argv[])
 ACE_INLINE int 
 Handle_R_Stream::fini (void) 
 {
-  return ACE_Reactor::instance()->remove_handler 
+  return ACE_Reactor::instance ()->remove_handler 
     (this, ACE_Event_Handler::ACCEPT_MASK);
 }
 
diff --git a/examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.cpp b/examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.cpp
index 701d5a9e0f1..f08965d7832 100644
--- a/examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.cpp
+++ b/examples/Service_Configurator/IPC-tests/server/Handle_Thr_Stream.cpp
@@ -81,7 +81,7 @@ Handle_Thr_Acceptor<SH, PR_AC_2>::init (int argc, char *argv[])
 
   // Initialize the Acceptor base class, passing in the desired
   // concurrency strategy.
-  else if (this->open (local_addr, ACE_Reactor::instance(),
+  else if (this->open (local_addr, ACE_Reactor::instance (),
 		       0, 0, &this->thr_strategy_) == -1)
     ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "open"), -1);
   else
@@ -91,7 +91,7 @@ Handle_Thr_Acceptor<SH, PR_AC_2>::init (int argc, char *argv[])
 template <class SH, PR_AC_1> int 
 Handle_Thr_Acceptor<SH, PR_AC_2>::fini (void)
 {
-  return ACE_Reactor::instance()->remove_handler 
+  return ACE_Reactor::instance ()->remove_handler 
     (this, ACE_Event_Handler::ACCEPT_MASK);
 }
 
diff --git a/examples/Service_Configurator/IPC-tests/server/Handle_Timeout.i b/examples/Service_Configurator/IPC-tests/server/Handle_Timeout.i
index d2d77829756..f522de2cc9b 100644
--- a/examples/Service_Configurator/IPC-tests/server/Handle_Timeout.i
+++ b/examples/Service_Configurator/IPC-tests/server/Handle_Timeout.i
@@ -47,7 +47,7 @@ Handle_Timeout::init (int argc, char *argv[])
 	 break;
        }
   
-  if (ACE_Reactor::instance()->schedule_timer (this, 
+  if (ACE_Reactor::instance ()->schedule_timer (this, 
 						      (void *) arg, 
 						      delta, 
 						      interval) == -1)
diff --git a/examples/Service_Configurator/IPC-tests/server/server_test.cpp b/examples/Service_Configurator/IPC-tests/server/server_test.cpp
index 082cbf05cf4..528aaac3172 100644
--- a/examples/Service_Configurator/IPC-tests/server/server_test.cpp
+++ b/examples/Service_Configurator/IPC-tests/server/server_test.cpp
@@ -16,13 +16,13 @@ main (int argc, char *argv[])
   ACE_Sig_Adapter sa ((ACE_Sig_Handler_Ex) ACE_Reactor::end_event_loop);
 
   // Register a signal handler.
-  ACE_Reactor::instance()->register_handler (SIGINT, &sa);
+  ACE_Reactor::instance ()->register_handler (SIGINT, &sa);
 
   // Run forever, performing the configured services until we are shut
   // down by a SIGINT/SIGQUIT signal.
 
   while (ACE_Reactor::event_loop_done() == 0)
-    ACE_Reactor::run_event_loop();
+    ACE_Reactor::run_event_loop ();
 
   return 0;
 }
diff --git a/examples/Service_Configurator/Misc/Timer_Service.cpp b/examples/Service_Configurator/Misc/Timer_Service.cpp
index d30fea51cda..f244f74eaa2 100644
--- a/examples/Service_Configurator/Misc/Timer_Service.cpp
+++ b/examples/Service_Configurator/Misc/Timer_Service.cpp
@@ -46,7 +46,7 @@ Timer_Service::init (int argc, char *argv[])
 
   // Register the timer to go off in 1 second, and then to go off
   // every <interval> seconds.
-  if (ACE_Reactor::instance()->schedule_timer 
+  if (ACE_Reactor::instance ()->schedule_timer 
       (this, 0, ACE_Time_Value (1), ACE_Time_Value (interval)) == -1)
     return -1;
   else
diff --git a/examples/Service_Configurator/Misc/main.cpp b/examples/Service_Configurator/Misc/main.cpp
index 91a1b7749d9..f898ae8b974 100644
--- a/examples/Service_Configurator/Misc/main.cpp
+++ b/examples/Service_Configurator/Misc/main.cpp
@@ -19,6 +19,6 @@ main (int argc, char *argv[])
   // Run forever, performing the configured services until we receive
   // a SIGINT.
 
-  ACE_Reactor::run_event_loop();
+  ACE_Reactor::run_event_loop ();
   return 0;
 }
diff --git a/examples/Threads/task_three.cpp b/examples/Threads/task_three.cpp
index 45ac8106784..58c6b25eb24 100644
--- a/examples/Threads/task_three.cpp
+++ b/examples/Threads/task_three.cpp
@@ -177,7 +177,7 @@ main (int argc, char **)
   ACE_Sig_Action sa ((ACE_SignalHandler) handler, SIGINT);
   ACE_UNUSED_ARG (sa);
 
-  ACE_Reactor *reactor1 = ACE_Reactor::instance();
+  ACE_Reactor *reactor1 = ACE_Reactor::instance ();
   ACE_Reactor *reactor2 = new ACE_Reactor ();
 
   Test_Task t1[TASK_COUNT];