summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorschmidt <douglascraigschmidt@users.noreply.github.com>2002-03-15 12:04:24 +0000
committerschmidt <douglascraigschmidt@users.noreply.github.com>2002-03-15 12:04:24 +0000
commit345f095ecf2681574b6b1649e74996fea9475ce8 (patch)
treef44327669b1bc96b2ca1a5afdfdb1f2b3c1143ff
parentac972ca5270e68cbf190928f15793aa6d589683f (diff)
downloadATCD-345f095ecf2681574b6b1649e74996fea9475ce8.tar.gz
ChangeLogTag:Fri Mar 15 05:59:45 2002 Douglas C. Schmidt <schmidt@macarena.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/SPIPE_Acceptor.cpp15
5 files changed, 26 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index fae59e0c832..2502b091665 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Mar 15 05:59:45 2002 Douglas C. Schmidt <schmidt@macarena.cs.wustl.edu>
+
+ * ace/SPIPE_Acceptor.cpp: Removed the ACE_ASSERT (result == FALSE)
+ macro call. Thanks to Oleg <ua_fireball@yahoo.com> for
+ reporting this.
+
Fri Mar 15 00:16:06 2002 Craig Rodrigues <crodrigu@bbn.com>
* include/makeinclude/platform_freebsd.GNU:
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index fae59e0c832..2502b091665 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,9 @@
+Fri Mar 15 05:59:45 2002 Douglas C. Schmidt <schmidt@macarena.cs.wustl.edu>
+
+ * ace/SPIPE_Acceptor.cpp: Removed the ACE_ASSERT (result == FALSE)
+ macro call. Thanks to Oleg <ua_fireball@yahoo.com> for
+ reporting this.
+
Fri Mar 15 00:16:06 2002 Craig Rodrigues <crodrigu@bbn.com>
* include/makeinclude/platform_freebsd.GNU:
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index fae59e0c832..2502b091665 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,9 @@
+Fri Mar 15 05:59:45 2002 Douglas C. Schmidt <schmidt@macarena.cs.wustl.edu>
+
+ * ace/SPIPE_Acceptor.cpp: Removed the ACE_ASSERT (result == FALSE)
+ macro call. Thanks to Oleg <ua_fireball@yahoo.com> for
+ reporting this.
+
Fri Mar 15 00:16:06 2002 Craig Rodrigues <crodrigu@bbn.com>
* include/makeinclude/platform_freebsd.GNU:
diff --git a/THANKS b/THANKS
index b29ed9629c2..27d15229fa3 100644
--- a/THANKS
+++ b/THANKS
@@ -1483,6 +1483,7 @@ Jon Lambert <jlsysinc@ix.netcom.com>
Rainer Lucas <rainer.lucas@fun.de>
Allan S Iverson <allaniverson@sprynet.com>
Jeffrey Shaffer <jeffs@integ.com>
+Oleg <ua_fireball@yahoo.com>
I would particularly like to thank Paul Stephenson, who worked with me
at Ericsson in the early 1990's. Paul devised the recursive Makefile
diff --git a/ace/SPIPE_Acceptor.cpp b/ace/SPIPE_Acceptor.cpp
index ace2ceabbc5..27457ac20be 100644
--- a/ace/SPIPE_Acceptor.cpp
+++ b/ace/SPIPE_Acceptor.cpp
@@ -115,13 +115,13 @@ ACE_SPIPE_Acceptor::create_new_instance (int perms)
return -1;
else
{
- // Start the Connect (analogous to listen () for a socket). Completion
- // is noted by the event being signalled. If a client connects
- // before this call, the error status will be ERROR_PIPE_CONNECTED, in
- // which case that fact is remembered via already_connected_ and noted
- // when the user calls accept ().
- // Else the error status should be ERROR_IO_PENDING and the OS will
- // signal the event when it's done.
+ // Start the Connect (analogous to listen () for a socket).
+ // Completion is noted by the event being signalled. If a
+ // client connects before this call, the error status will be
+ // ERROR_PIPE_CONNECTED, in which case that fact is remembered
+ // via already_connected_ and noted when the user calls accept
+ // (). Else the error status should be ERROR_IO_PENDING and the
+ // OS will signal the event when it's done.
this->already_connected_ = 0;
this->set_handle (this->event_.handle ());
this->overlapped_.hEvent = this->event_.handle ();
@@ -129,7 +129,6 @@ ACE_SPIPE_Acceptor::create_new_instance (int perms)
BOOL result = ::ConnectNamedPipe (this->pipe_handle_,
&this->overlapped_);
- ACE_ASSERT (result == FALSE);
ACE_UNUSED_ARG (result);
status = ::GetLastError ();