diff options
| author | schmidt <douglascraigschmidt@users.noreply.github.com> | 2006-11-08 19:06:57 +0000 |
|---|---|---|
| committer | schmidt <douglascraigschmidt@users.noreply.github.com> | 2006-11-08 19:06:57 +0000 |
| commit | 9ef3b09874c19f5586f2fe04d9a69ee816be0ecc (patch) | |
| tree | 11bbb0c9d15a044c86cfe8d7aca9069cf2e297d9 | |
| parent | 0fa31c5e57358549859b55a6642de9629355d8e0 (diff) | |
| download | ATCD-9ef3b09874c19f5586f2fe04d9a69ee816be0ecc.tar.gz | |
ChangeLogTag:Mon
| -rw-r--r-- | ACE/ChangeLog | 8 | ||||
| -rw-r--r-- | ACE/THANKS | 3 | ||||
| -rw-r--r-- | ACE/ace/SOCK_IO.h | 4 | ||||
| -rw-r--r-- | CIAO/ChangeLog | 3 |
4 files changed, 14 insertions, 4 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 93ce4c90270..27059de7a47 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,9 @@ +Mon Nov 6 16:07:43 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> + + * ace/SOCK_IO.h (ACE_SOCK_IO): Clarified the behavior of + non-blocking I/O. Thanks to Robert Neumann <robert dot neumann + at gmail dot com> for motivating this change. + Tue Nov 08 15:40:10 UTC 2006 Martin Corino <mcorino@remedy.nl> * ace/INET_Addr.inl: @@ -62,6 +68,7 @@ Tue Nov 7 07:52:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> * include/makeinclude/platform_rtems.x_g++.GNU: Removed -ansi +>>>>>>> .r75251 Tue Nov 7 01:47:46 UTC 2006 Phil Mesnier <mesnier_p@ociweb.com> * ace/Sock_Connect.cpp (count_interfaces): @@ -88,6 +95,7 @@ Mon Nov 6 16:52:14 UTC 2006 Phil Mesnier <mesnier_p@ociweb.com> the footprint and improves performance by eliminating the effectively duplicated code in count_interfaces(). +>>>>>>> .r75238 Mon Nov 06 14:14:10 UTC 2006 Martin Corino <mcorino@remedy.nl> * ace/config-vxworks6.3.h: diff --git a/ACE/THANKS b/ACE/THANKS index aaa98106ccd..4936d09d3ab 100644 --- a/ACE/THANKS +++ b/ACE/THANKS @@ -2157,7 +2157,8 @@ Artur DeEsperanto <DrEsperanto at gmx dot net> Scott Mitchell <rsm at progress dot com> Thomas Vanier <thomas dot vanier at gmail dot com> N Johnson <nj at artesys dot info> -Adam Nagel <nagelar@isis.vanderbilt.edu> +Adam Nagel <nagelar at isis dot vanderbilt dot edu> +Robert Neumann <robert dot neumann at gmail dot com> Venkat <swara101 at yahoo dot com> I would particularly like to thank Paul Stephenson, who worked with me diff --git a/ACE/ace/SOCK_IO.h b/ACE/ace/SOCK_IO.h index 746a414f6a2..b59421602ac 100644 --- a/ACE/ace/SOCK_IO.h +++ b/ACE/ace/SOCK_IO.h @@ -35,8 +35,8 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL * If <timeout> == 0, then the call behaves as a normal * send/recv call, i.e., for blocking sockets, the call will * block until action is possible; for non-blocking sockets, - * EWOULDBLOCK will be returned if no action is immediately - * possible. + * -1 will be returned with errno == EWOULDBLOCK if no action is + * immediately possible. * If <timeout> != 0, the call will wait until the relative time * specified in *<timeout> elapses. * Errors are reported by -1 and 0 return values. If the diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog index 18da3934344..9e6df6817e9 100644 --- a/CIAO/ChangeLog +++ b/CIAO/ChangeLog @@ -44,7 +44,8 @@ Thu Nov 2 20:22:46 UTC 2006 Douglas C. Schmidt <schmidt@dre.vanderbilt.edu> * DAnCE/tests/NodeApplicationTest/NodeApp_test_client_dynamic.cpp (main): * DAnCE/tests/NodeApplicationTest/NodeApp_test_client_ex.cpp: * DAnCE/NodeManager/Node_Manager.cpp (main): Replaced exit() with - ACE_OS::exit(). Thanks to Abdul Sowayan for reporting this. + ACE_OS::exit(). Thanks to Abdul Sowayan for reporting this. + This fixes bugid #2695. Mon Oct 30 19:13:03 UTC 2006 Jeff Parsons <j.parsons@vanderbilt.edu> |