ChangeLogTag:Thu Dec 13 16:41:39 2001 Steve Huston <shuston@riverace.com>

4 files changed, 7 insertions, 5 deletions

diff --git a/examples/Reactor/WFMO_Reactor/test_multithreading.cpp b/examples/Reactor/WFMO_Reactor/test_multithreading.cpp
index b2988c18b96..b0a3bdca5fc 100644
--- a/examples/Reactor/WFMO_Reactor/test_multithreading.cpp
+++ b/examples/Reactor/WFMO_Reactor/test_multithreading.cpp
@@ -236,11 +236,10 @@ main (int argc, char **argv)
   // Wait for all threads to exit
   ACE_Thread_Manager::instance ()->wait ();
 
-  // Delete dynamic resources; this is necessary since it will destroy
-  // the Reactor instance.  If we wait for the Object Manager to do
-  // this, it will be too late since Task_Handler instance would have
-  // disappeared.
-  ACE_Service_Config::close_singletons ();
+  // Close the Reactor singleton before exiting this function.
+  // If we wait for the Object Manager to do this, it will be too
+  // late since Task_Handler instance would have disappeared.
+  ACE_Reactor::close_singleton ();
 
   return 0;
 }
diff --git a/examples/Reactor/WFMO_Reactor/test_suspended_removals.cpp b/examples/Reactor/WFMO_Reactor/test_suspended_removals.cpp
index 08a6c3160ce..4dc7cc33bb7 100644
--- a/examples/Reactor/WFMO_Reactor/test_suspended_removals.cpp
+++ b/examples/Reactor/WFMO_Reactor/test_suspended_removals.cpp
@@ -18,6 +18,7 @@
 //
 // ============================================================================
 
+#include "ace/Reactor.h"
 #include "ace/WFMO_Reactor.h"
 #include "ace/Synch.h"
 
diff --git a/examples/Reactor/WFMO_Reactor/test_talker.cpp b/examples/Reactor/WFMO_Reactor/test_talker.cpp
index 0a52bf3ea9e..76d6a5f12d0 100644
--- a/examples/Reactor/WFMO_Reactor/test_talker.cpp
+++ b/examples/Reactor/WFMO_Reactor/test_talker.cpp
@@ -133,6 +133,7 @@
 // ============================================================================
 
 #include "ace/Reactor.h"
+#include "ace/Reactor_Notification_Strategy.h"
 #include "ace/WIN32_Proactor.h"
 #include "ace/Proactor.h"
 #include "ace/SOCK_Connector.h"
diff --git a/examples/Reactor/WFMO_Reactor/test_window_messages.cpp b/examples/Reactor/WFMO_Reactor/test_window_messages.cpp
index beae4d3c3e5..f46dea7ad19 100644
--- a/examples/Reactor/WFMO_Reactor/test_window_messages.cpp
+++ b/examples/Reactor/WFMO_Reactor/test_window_messages.cpp
@@ -20,6 +20,7 @@
 // ============================================================================
 
 #include "ace/Msg_WFMO_Reactor.h"
+#include "ace/Reactor.h"
 #include "ace/Auto_Ptr.h"
 
 ACE_RCSID(WFMO_Reactor, test_window_messages, "$Id$")