diff options
Diffstat (limited to 'ACE/tests/Bug_1890_Regression_Test.cpp')
| -rw-r--r-- | ACE/tests/Bug_1890_Regression_Test.cpp | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/ACE/tests/Bug_1890_Regression_Test.cpp b/ACE/tests/Bug_1890_Regression_Test.cpp index 8a8cade4d90..a28c8302b77 100644 --- a/ACE/tests/Bug_1890_Regression_Test.cpp +++ b/ACE/tests/Bug_1890_Regression_Test.cpp @@ -14,7 +14,7 @@ #include "ace/Pipe.h" #include "ace/Event_Handler.h" -#include "ace/Select_Reactor.h" +#include "ace/Reactor.h" ACE_RCSID (tests, Bug_1890_Regression_Test, @@ -95,19 +95,18 @@ run_main (int, ACE_TCHAR *[]) { ACE_START_TEST (ACE_TEXT ("Bug_1890_Regression_Test")); - ACE_Select_Reactor select_reactor; - ACE_Reactor reactor (&select_reactor); + ACE_Reactor * reactor = ACE_Reactor::instance(); // Create the timer, this is the main driver for the test Timer * timer = new Timer; // Initialize the timer and register with the reactor - if (-1 == timer->open(&reactor)) + if (-1 == timer->open(reactor)) { ACE_ERROR_RETURN ((LM_ERROR, "Cannot initialize timer\n"), -1); } - reactor.run_reactor_event_loop(); + reactor->run_reactor_event_loop(); // Verify that the results are what we expect if (!timer->check_expected_results()) @@ -117,7 +116,6 @@ run_main (int, ACE_TCHAR *[]) // Cleanup timer->close(); - delete timer; ACE_END_TEST; @@ -246,7 +244,7 @@ int Timer::handle_timeout(ACE_Time_Value const &, void const *) return 0; } - reactor()->end_reactor_event_loop(); + reactor()->end_event_loop(); return 0; } |