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

8 files changed, 62 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index 416bb27d3d9..5b5e528d274 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+Thu Dec 13 16:41:39 2001  Steve Huston  <shuston@riverace.com>
+
+        * examples/Reactor/WFMO_Reactor/test_multithreading.cpp: Changed
+          call to ACE_Service_Config::close_singletons () to call
+          ACE_Reactor::close_singleton() instead. Recent changes made
+          it necessary to include "ace/Service_Config.h" here to use
+          the former, and it seemed better to call the only needed singleton
+          destroyer necessary in this case.
+
+        * examples/Reactor/WFMO_Reactor/test_suspended_removals.cpp:
+        * examples/Reactor/WFMO_Reactor/test_window_messages.cpp:
+        * examples/Bounded_Packet_Relay/BPR_Drivers.h:
+          Added #include "ace/Reactor.h" - recent changes necessitate this.
+
+        * examples/Reactor/WFMO_Reactor/test_talker.cpp: Added
+          #include "ace/Reactor_Notification_Strategy.h" - recent changes
+          necessitate this.
+
 Wed Dec 12 16:29:17 2001  Greg Burley  <Burley@tabq.com.au>
 
 	* ace/SSL/SSL_Context.h:
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index 416bb27d3d9..5b5e528d274 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,21 @@
+Thu Dec 13 16:41:39 2001  Steve Huston  <shuston@riverace.com>
+
+        * examples/Reactor/WFMO_Reactor/test_multithreading.cpp: Changed
+          call to ACE_Service_Config::close_singletons () to call
+          ACE_Reactor::close_singleton() instead. Recent changes made
+          it necessary to include "ace/Service_Config.h" here to use
+          the former, and it seemed better to call the only needed singleton
+          destroyer necessary in this case.
+
+        * examples/Reactor/WFMO_Reactor/test_suspended_removals.cpp:
+        * examples/Reactor/WFMO_Reactor/test_window_messages.cpp:
+        * examples/Bounded_Packet_Relay/BPR_Drivers.h:
+          Added #include "ace/Reactor.h" - recent changes necessitate this.
+
+        * examples/Reactor/WFMO_Reactor/test_talker.cpp: Added
+          #include "ace/Reactor_Notification_Strategy.h" - recent changes
+          necessitate this.
+
 Wed Dec 12 16:29:17 2001  Greg Burley  <Burley@tabq.com.au>
 
 	* ace/SSL/SSL_Context.h:
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index 416bb27d3d9..5b5e528d274 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,21 @@
+Thu Dec 13 16:41:39 2001  Steve Huston  <shuston@riverace.com>
+
+        * examples/Reactor/WFMO_Reactor/test_multithreading.cpp: Changed
+          call to ACE_Service_Config::close_singletons () to call
+          ACE_Reactor::close_singleton() instead. Recent changes made
+          it necessary to include "ace/Service_Config.h" here to use
+          the former, and it seemed better to call the only needed singleton
+          destroyer necessary in this case.
+
+        * examples/Reactor/WFMO_Reactor/test_suspended_removals.cpp:
+        * examples/Reactor/WFMO_Reactor/test_window_messages.cpp:
+        * examples/Bounded_Packet_Relay/BPR_Drivers.h:
+          Added #include "ace/Reactor.h" - recent changes necessitate this.
+
+        * examples/Reactor/WFMO_Reactor/test_talker.cpp: Added
+          #include "ace/Reactor_Notification_Strategy.h" - recent changes
+          necessitate this.
+
 Wed Dec 12 16:29:17 2001  Greg Burley  <Burley@tabq.com.au>
 
 	* ace/SSL/SSL_Context.h:
diff --git a/examples/Bounded_Packet_Relay/BPR_Drivers.h b/examples/Bounded_Packet_Relay/BPR_Drivers.h
index 83f37022994..95967f921dc 100644
--- a/examples/Bounded_Packet_Relay/BPR_Drivers.h
+++ b/examples/Bounded_Packet_Relay/BPR_Drivers.h
@@ -35,6 +35,7 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "ace/Reactor.h"
 #include "ace/Task.h"
 #include "ace/Synch.h"
 
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$")