diff options
| author | nanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-01-12 23:04:22 +0000 |
|---|---|---|
| committer | nanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-01-12 23:04:22 +0000 |
| commit | a3bbf34cfef4cc24b69f8c6eb769b5bed2f56d18 (patch) | |
| tree | ec4e5eaa971c4e61ca2d71bc6449be650f500e57 /ace/SOCK_IO.cpp | |
| parent | af2255d666d23fabfdca5a5fa7c90002633a66e6 (diff) | |
| download | ATCD-a3bbf34cfef4cc24b69f8c6eb769b5bed2f56d18.tar.gz | |
Fixed name clashing with SOCK_Stream
Diffstat (limited to 'ace/SOCK_IO.cpp')
| -rw-r--r-- | ace/SOCK_IO.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ace/SOCK_IO.cpp b/ace/SOCK_IO.cpp index 26e515ad2ce..853d11f9ed7 100644 --- a/ace/SOCK_IO.cpp +++ b/ace/SOCK_IO.cpp @@ -24,8 +24,9 @@ ACE_SOCK_IO::dump (void) const // returns the number of bytes read. ssize_t -ACE_SOCK_IO::recv (iovec *io_vec) +ACE_SOCK_IO::recvv (iovec *io_vec) { + ACE_TRACE ("ACE_SOCK_IO::recvv"); #if defined (FIONREAD) u_long inlen; @@ -39,7 +40,7 @@ ACE_SOCK_IO::recv (iovec *io_vec) return io_vec->iov_len; } else - return 0; + return 0; #else ACE_UNUSED_ARG (io_vec); ACE_NOTSUP_RETURN (-1); @@ -56,12 +57,12 @@ ACE_SOCK_IO::send (size_t n, ...) const { ACE_TRACE ("ACE_SOCK_IO::send"); - va_list argp; + va_list argp; size_t total_tuples = n / 2; iovec *iovp; #if defined (ACE_HAS_ALLOCA) iovp = (iovec *) alloca (total_tuples * sizeof (iovec)); -#else +#else ACE_NEW_RETURN (iovp, iovec[total_tuples], -1); #endif /* !defined (ACE_HAS_ALLOCA) */ @@ -92,7 +93,7 @@ ACE_SOCK_IO::recv (size_t n, ...) const { ACE_TRACE ("ACE_SOCK_IO::recv"); - va_list argp; + va_list argp; size_t total_tuples = n / 2; iovec *iovp; #if defined (ACE_HAS_ALLOCA) @@ -116,4 +117,3 @@ ACE_SOCK_IO::recv (size_t n, ...) const va_end (argp); return result; } - |