diff options
| author | schmidt <douglascraigschmidt@users.noreply.github.com> | 2004-11-03 16:00:22 +0000 |
|---|---|---|
| committer | schmidt <douglascraigschmidt@users.noreply.github.com> | 2004-11-03 16:00:22 +0000 |
| commit | f588cd9d3a2555ea76f895f32691b35f513062a9 (patch) | |
| tree | 0ab4d53e3dd76606f587778b7c9f1c54da7b074c | |
| parent | e2fdde5e961950287a3292e8d5ccf6361a737a01 (diff) | |
| download | ATCD-f588cd9d3a2555ea76f895f32691b35f513062a9.tar.gz | |
ChangeLogTag:Wed Nov 3 09:40:21 2004 Chad Elliott <elliott_c@ociweb.com>
| -rw-r--r-- | ace/DEV_IO.h | 1 | ||||
| -rw-r--r-- | ace/DEV_IO.inl | 10 |
2 files changed, 5 insertions, 6 deletions
diff --git a/ace/DEV_IO.h b/ace/DEV_IO.h index bdb5bee9f16..69e584a401b 100644 --- a/ace/DEV_IO.h +++ b/ace/DEV_IO.h @@ -11,7 +11,6 @@ */ //============================================================================= - #ifndef ACE_DEV_IO_H #define ACE_DEV_IO_H #include /**/ "ace/pre.h" diff --git a/ace/DEV_IO.inl b/ace/DEV_IO.inl index 309ea6c6cde..3724c7cc492 100644 --- a/ace/DEV_IO.inl +++ b/ace/DEV_IO.inl @@ -23,9 +23,10 @@ ACE_DEV_IO::send_n (const void *buf, size_t n) const // this many bytes are received. ACE_INLINE ssize_t -ACE_DEV_IO::recv_n (void *buf, size_t n, +ACE_DEV_IO::recv_n (void *buf, + size_t n, const ACE_Time_Value *timeout, - size_t *bt) const + size_t *bytes_transferred) const { ACE_TRACE ("ACE_DEV_IO::recv_n"); #if defined (ACE_WIN32) @@ -34,14 +35,13 @@ ACE_DEV_IO::recv_n (void *buf, size_t n, return ACE::read_n (this->get_handle (), buf, n, - bt); + bytes_transferred); #else - return ACE::recv_n (this->get_handle (), buf, n, timeout, - bt); + bytes_transferred); #endif /*ACE_WIN32*/ } |