diff options
Diffstat (limited to 'netsvcs/clients/Tokens')
-rw-r--r-- | netsvcs/clients/Tokens/collection/collection.cpp | 4 | ||||
-rw-r--r-- | netsvcs/clients/Tokens/manual/manual.cpp | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/netsvcs/clients/Tokens/collection/collection.cpp b/netsvcs/clients/Tokens/collection/collection.cpp index 68f7e40b0a4..44a58ffec02 100644 --- a/netsvcs/clients/Tokens/collection/collection.cpp +++ b/netsvcs/clients/Tokens/collection/collection.cpp @@ -41,7 +41,7 @@ static int remote = 0; static void * run_thread (void *vp) { - ACE_Thread_Control tc (ACE_Service_Config::thr_mgr ()); + ACE_Thread_Control tc (ACE_Thread_Manager::instance ()); ACE_Token_Proxy *collection = (ACE_Token_Proxy *) vp; int count = iterations; @@ -176,7 +176,7 @@ main (int argc, char* argv[]) collectionBR.insert (*R); // Spawn off three threads. - ACE_Thread_Manager *mgr = ACE_Service_Config::thr_mgr (); + ACE_Thread_Manager *mgr = ACE_Thread_Manager::instance (); if (mgr->spawn (ACE_THR_FUNC (run_thread), (void *) &collectionAR, THR_BOUND | THR_SUSPENDED) == -1) diff --git a/netsvcs/clients/Tokens/manual/manual.cpp b/netsvcs/clients/Tokens/manual/manual.cpp index f9f269bb0c3..de9282ffc21 100644 --- a/netsvcs/clients/Tokens/manual/manual.cpp +++ b/netsvcs/clients/Tokens/manual/manual.cpp @@ -146,7 +146,7 @@ STDIN_Token::open (int argc, char *argv[]) return -1; // Register for signals. - if (ACE_Service_Config::reactor ()->register_handler + if (ACE_Reactor::instance ()->register_handler (SIGINT, this) == -1) ACE_DEBUG ((LM_DEBUG, "Can't register signal handler\n")); @@ -154,7 +154,7 @@ STDIN_Token::open (int argc, char *argv[]) #else // Register for STDIN events with Reactor. - if (ACE_Service_Config::reactor ()->register_handler + if (ACE_Reactor::instance ()->register_handler (ACE_STDIN, this, ACE_Event_Handler::READ_MASK) == -1) ACE_ERROR_RETURN ((LM_DEBUG, "Can't register signal handler\n"), 0); @@ -167,7 +167,7 @@ STDIN_Token::open (int argc, char *argv[]) #if (ACE_WIN32) #else - ACE_Service_Config::run_reactor_event_loop (); + ACE_Reactor::run_event_loop (); #endif /* ACE_WIN32 */ ACE_OS::printf ("Exiting...\n"); @@ -260,7 +260,7 @@ STDIN_Token::handle_exception (ACE_HANDLE fd) { ACE_UNUSED_ARG (fd); - ACE_Service_Config::run_reactor_event_loop (); + ACE_Reactor::run_event_loop (); return -1; } |