summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorschmidt <douglascraigschmidt@users.noreply.github.com>2000-02-17 14:15:36 +0000
committerschmidt <douglascraigschmidt@users.noreply.github.com>2000-02-17 14:15:36 +0000
commit36dae598860856f9bbdd9d4409e03c91e8a62d75 (patch)
tree13f8f3b30fcf67021779db8a5079faf9ee40ef37
parent70a4082d309aed341e82d1da4ccde315624f5ee9 (diff)
downloadATCD-36dae598860856f9bbdd9d4409e03c91e8a62d75.tar.gz
ChangeLogTag:Thu Feb 17 08:10:08 2000 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu>
-rw-r--r--ChangeLog6
-rw-r--r--ChangeLogs/ChangeLog-02a6
-rw-r--r--ChangeLogs/ChangeLog-03a6
-rw-r--r--THANKS1
-rw-r--r--ace/Service_Config.cpp4
5 files changed, 21 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 930da60a890..e8086cad634 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Thu Feb 17 08:10:08 2000 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu>
+
+ * ace/Service_Config.cpp (close_singletons): Don't bother calling
+ ACE_Proactor::close_singleton() on WinCE, Win95/98, or if
+ these's no support for AIO calls. Thanks to Sangwoo Jin <swjinjin@sei.co.kr> for reporting this.
+
Wed Feb 16 17:03:31 2000 Steve Huston <shuston@riverace.com>
* tests/version_tests/version_tests.dsw: Add Capabilities_Test.dsp.
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index 930da60a890..e8086cad634 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,9 @@
+Thu Feb 17 08:10:08 2000 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu>
+
+ * ace/Service_Config.cpp (close_singletons): Don't bother calling
+ ACE_Proactor::close_singleton() on WinCE, Win95/98, or if
+ these's no support for AIO calls. Thanks to Sangwoo Jin <swjinjin@sei.co.kr> for reporting this.
+
Wed Feb 16 17:03:31 2000 Steve Huston <shuston@riverace.com>
* tests/version_tests/version_tests.dsw: Add Capabilities_Test.dsp.
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index 930da60a890..e8086cad634 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,9 @@
+Thu Feb 17 08:10:08 2000 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu>
+
+ * ace/Service_Config.cpp (close_singletons): Don't bother calling
+ ACE_Proactor::close_singleton() on WinCE, Win95/98, or if
+ these's no support for AIO calls. Thanks to Sangwoo Jin <swjinjin@sei.co.kr> for reporting this.
+
Wed Feb 16 17:03:31 2000 Steve Huston <shuston@riverace.com>
* tests/version_tests/version_tests.dsw: Add Capabilities_Test.dsp.
diff --git a/THANKS b/THANKS
index eddd2599b30..d0336757329 100644
--- a/THANKS
+++ b/THANKS
@@ -899,6 +899,7 @@ Hajdukiewicz Markus <MHajdukiewic@heyde.de>
Gerwin Robert <RGerwin@heyde.de>
Boris Sukholitko <boris@webglide.com>
Alia Atlas <akatlas@bbn.com>
+David Hall <David.Hall@grc.nasa.gov>
I would particularly like to thank Paul Stephenson, who worked with me
at Ericsson. Paul devised the recursive Makefile scheme that
diff --git a/ace/Service_Config.cpp b/ace/Service_Config.cpp
index 1aca979a501..f5176b389f9 100644
--- a/ace/Service_Config.cpp
+++ b/ace/Service_Config.cpp
@@ -831,9 +831,9 @@ ACE_Service_Config::close_singletons (void)
ACE_TRACE ("ACE_Service_Config::close_singletons");
ACE_Reactor::close_singleton ();
-#if !defined (ACE_HAS_WINCE)
+#if (((defined (ACE_HAS_WINNT)) && (ACE_HAS_WINNT == 1)) || (defined (ACE_HAS_AIO_CALLS)))
ACE_Proactor::close_singleton ();
-#endif /* !ACE_HAS_WINCE */
+#endif /* (((defined (ACE_HAS_WINNT)) && (ACE_HAS_WINNT == 1)) || (defined (ACE_HAS_AIO_CALLS))) */
#if ! defined (ACE_THREAD_MANAGER_LACKS_STATICS)
ACE_Thread_Manager::close_singleton ();
#endif /* ! ACE_THREAD_MANAGER_LACKS_STATICS */