summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2005-04-13 20:42:51 +0000
committerjtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2005-04-13 20:42:51 +0000
commit9189ffd8511f117d29367a3dab6e5d058894da5f (patch)
treefecc68718c9a7733f2ab948dbef26db087cdc0af
parent6154e18d5382e0de93b5f203dc8fccea3ceccbdb (diff)
downloadATCD-9189ffd8511f117d29367a3dab6e5d058894da5f.tar.gz
ChangeLogTag: Wed Apr 13 13:42:21 2005 J.T. Conklin <jtc@acorntoolworks.com>
-rw-r--r--ChangeLog14
-rw-r--r--ace/Proactor_Impl.cpp6
2 files changed, 16 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 09f8b520346..190a352258c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Wed Apr 13 13:42:21 2005 J.T. Conklin <jtc@acorntoolworks.com>
+
+ * ace/Proactor_Impl.cpp:
+
+ Only compile if system supports asynchronous I/O.
+
Wed Apr 13 19:07:41 2005 Olli Savia <ops@iki.fi>
* ace/OS_NS_time.inl:
@@ -6,11 +12,11 @@ Wed Apr 13 19:07:41 2005 Olli Savia <ops@iki.fi>
* ace/OS_NS_unistd.inl:
Fixed wrong comment and removed commented out code.
-
+
* ace/README:
Documented new macros ACE_HAS_NONCONST_CLOCK_SETTIME
and ACE_LACKS_SCANDIR_PROTOTYPE.
-
+
* ace/TSS_T.h:
Fixed wrong comment.
@@ -18,11 +24,11 @@ Wed Apr 13 19:07:41 2005 Olli Savia <ops@iki.fi>
Added new defines ACE_HAS_NONCONST_CLOCK_SETTIME,
ACE_HAS_SCANDIR, ACE_LACKS_SCANDIR_PROTOTYPE and
ACE_SCANDIR_CMP_USES_VOIDPTR.
-
+
* ace/os_include/os_dirent.h:
Declare scandir() prototype if ACE_LACKS_SCANDIR_PROTOTYPE
is defined.
-
+
Wed Apr 13 14:34:12 UTC 2005 Martin Corino <mcorino@remedy.nl>
* ace/Reactor.cpp:
diff --git a/ace/Proactor_Impl.cpp b/ace/Proactor_Impl.cpp
index 40127c974ad..9d8a3b08377 100644
--- a/ace/Proactor_Impl.cpp
+++ b/ace/Proactor_Impl.cpp
@@ -6,6 +6,12 @@ ACE_RCSID (ace,
Proactor_Impl,
"$Id$")
+#if ((defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || (defined (ACE_HAS_AIO_CALLS)))
+// This only works on Win32 platforms and on Unix platforms supporting
+// aio calls.
+
ACE_Proactor_Impl::~ACE_Proactor_Impl()
{
}
+
+#endif