diff options
| -rw-r--r-- | ChangeLog | 17 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-02a | 17 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-03a | 17 | ||||
| -rw-r--r-- | ace/ACE.cpp | 2 |
4 files changed, 52 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index 90c843230c9..40721449016 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,19 @@ +Fri Jul 5 16:14:51 2002 Steve Huston <shuston@riverace.com> + + * ace/OS.{h i} (send, sendto, recv, recvfrom): Change 'len' argument + from int to size_t. + Removed conditional typedef of ssize_t; it's done in Basic_Types.h. + + * ace/ACE.h (recv): Filled in documentation for varargs variant. + * ace/ACE.cpp (send, recv): Properly convert size_t 'count' arg to int + iovec count for call to ACE_OS::sendv/recvv(). + (handle_timed_accept, handle_timed_complete, handle_ready): Use + an int select_width for ACE_OS::select() calls to get the types + correct. This arg is ignored on Windows anyway. + + * ace/Basic_Types.h: If ACE_HAS_SSIZE_T not defined, and Win64, + typedef SSIZE_T ssize_t; else use the existing int typedef. + Wed Jul 3 11:09:31 2002 Steve Huston <shuston@riverace.com> * tests/SSL/Thread_Pool_Reactor_SSL_Test.cpp: @@ -270,6 +286,7 @@ Mon Jun 24 20:55:45 2002 Irfan Pyarali <irfan@cs.wustl.edu> * ace/ACE.cpp (select): Fixed typo. +>>>>>>> 4.3835 Mon Jun 24 17:39:31 2002 Steve Huston <shuston@riverace.com> * ace/ace_dll64.mak: diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a index 90c843230c9..40721449016 100644 --- a/ChangeLogs/ChangeLog-02a +++ b/ChangeLogs/ChangeLog-02a @@ -1,3 +1,19 @@ +Fri Jul 5 16:14:51 2002 Steve Huston <shuston@riverace.com> + + * ace/OS.{h i} (send, sendto, recv, recvfrom): Change 'len' argument + from int to size_t. + Removed conditional typedef of ssize_t; it's done in Basic_Types.h. + + * ace/ACE.h (recv): Filled in documentation for varargs variant. + * ace/ACE.cpp (send, recv): Properly convert size_t 'count' arg to int + iovec count for call to ACE_OS::sendv/recvv(). + (handle_timed_accept, handle_timed_complete, handle_ready): Use + an int select_width for ACE_OS::select() calls to get the types + correct. This arg is ignored on Windows anyway. + + * ace/Basic_Types.h: If ACE_HAS_SSIZE_T not defined, and Win64, + typedef SSIZE_T ssize_t; else use the existing int typedef. + Wed Jul 3 11:09:31 2002 Steve Huston <shuston@riverace.com> * tests/SSL/Thread_Pool_Reactor_SSL_Test.cpp: @@ -270,6 +286,7 @@ Mon Jun 24 20:55:45 2002 Irfan Pyarali <irfan@cs.wustl.edu> * ace/ACE.cpp (select): Fixed typo. +>>>>>>> 4.3835 Mon Jun 24 17:39:31 2002 Steve Huston <shuston@riverace.com> * ace/ace_dll64.mak: diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index 90c843230c9..40721449016 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,3 +1,19 @@ +Fri Jul 5 16:14:51 2002 Steve Huston <shuston@riverace.com> + + * ace/OS.{h i} (send, sendto, recv, recvfrom): Change 'len' argument + from int to size_t. + Removed conditional typedef of ssize_t; it's done in Basic_Types.h. + + * ace/ACE.h (recv): Filled in documentation for varargs variant. + * ace/ACE.cpp (send, recv): Properly convert size_t 'count' arg to int + iovec count for call to ACE_OS::sendv/recvv(). + (handle_timed_accept, handle_timed_complete, handle_ready): Use + an int select_width for ACE_OS::select() calls to get the types + correct. This arg is ignored on Windows anyway. + + * ace/Basic_Types.h: If ACE_HAS_SSIZE_T not defined, and Win64, + typedef SSIZE_T ssize_t; else use the existing int typedef. + Wed Jul 3 11:09:31 2002 Steve Huston <shuston@riverace.com> * tests/SSL/Thread_Pool_Reactor_SSL_Test.cpp: @@ -270,6 +286,7 @@ Mon Jun 24 20:55:45 2002 Irfan Pyarali <irfan@cs.wustl.edu> * ace/ACE.cpp (select): Fixed typo. +>>>>>>> 4.3835 Mon Jun 24 17:39:31 2002 Steve Huston <shuston@riverace.com> * ace/ace_dll64.mak: diff --git a/ace/ACE.cpp b/ace/ACE.cpp index 4886dcda81f..6b96d16cc2a 100644 --- a/ace/ACE.cpp +++ b/ace/ACE.cpp @@ -1186,7 +1186,7 @@ ACE::recvv_n_i (ACE_HANDLE handle, if (n != 0) { char *base = ACE_static_cast (char *, - iov[s].iov_base); + iov[s].iov_base); iov[s].iov_base = base + n; iov[s].iov_len = iov[s].iov_len - n; } |