Fixed name clashing with SOCK_Stream

3 files changed, 36 insertions, 36 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;
 }
-
diff --git a/ace/SOCK_IO.h b/ace/SOCK_IO.h
index 78ce10309e3..91049ef6b53 100644
--- a/ace/SOCK_IO.h
+++ b/ace/SOCK_IO.h
@@ -59,18 +59,25 @@ public:
   // Recv an <n> byte buffer from the connected socket (uses
   // <read(2)>).
 
-  ssize_t send (const iovec iov[],
+  ssize_t sendv (const iovec iov[],
                 size_t n) const;
   // Send an <iovec> of size <n> to the connected socket.
 
-  ssize_t send_n (const iovec iov[],
-                  size_t n) const;
+  ssize_t recvv (iovec *io_vec);
+  // Allows a client to read from a socket without having to provide a
+  // buffer to read.  This method determines how much data is in the
+  // socket, allocates a buffer of this size, reads in the data, and
+  // returns the number of bytes read.  The caller is responsible for
+  // deleting the member in the <iov_base> field of <io_vec>.
+
+  ssize_t sendv_n (const iovec iov[],
+                   size_t n) const;
   // Send an <iovec> of size <n> to the connected socket (uses
   // <ACE::sendv_n>).  Will block until all bytes are sent or an error
   // occurs.
 
-  ssize_t recv (iovec iov[],
-                size_t n) const;
+  ssize_t recvv_n (iovec iov[],
+                   size_t n) const;
   // Receive an <iovec> of size <n> to the connected socket.
 
   ssize_t send (const void *buf,
@@ -125,13 +132,6 @@ public:
                 ACE_OVERLAPPED *overlapped) const;
   // Recv <n> bytes via Win32 ReadFile using overlapped I/O.
 
-  ssize_t recv (iovec *io_vec);
-  // Allows a client to read from a socket without having to provide a
-  // buffer to read.  This method determines how much data is in the
-  // socket, allocates a buffer of this size, reads in the data, and
-  // returns the number of bytes read.  The caller is responsible for
-  // deleting the member in the <iov_base> field of <io_vec>.
-
   void dump (void) const;
   // Dump the state of an object.
 
diff --git a/ace/SOCK_IO.i b/ace/SOCK_IO.i
index 2b4cf53826e..5304a1b2029 100644
--- a/ace/SOCK_IO.i
+++ b/ace/SOCK_IO.i
@@ -17,7 +17,7 @@ ACE_SOCK_IO::~ACE_SOCK_IO (void)
   // ACE_TRACE ("ACE_SOCK_IO::~ACE_SOCK_IO");
 }
 
-ASYS_INLINE ssize_t  
+ASYS_INLINE ssize_t
 ACE_SOCK_IO::send (const void *buf, size_t n, int flags) const
 {
   ACE_TRACE ("ACE_SOCK_IO::send");
@@ -26,7 +26,7 @@ ACE_SOCK_IO::send (const void *buf, size_t n, int flags) const
 
 // Recv an n byte message from the connected socket.
 
-ASYS_INLINE ssize_t  
+ASYS_INLINE ssize_t
 ACE_SOCK_IO::recv (void *buf, size_t n, int flags) const
 {
   ACE_TRACE ("ACE_SOCK_IO::recv");
@@ -35,7 +35,7 @@ ACE_SOCK_IO::recv (void *buf, size_t n, int flags) const
 
 // Send an n byte message to the connected socket.
 
-ASYS_INLINE ssize_t  
+ASYS_INLINE ssize_t
 ACE_SOCK_IO::send (const void *buf, size_t n) const
 {
   ACE_TRACE ("ACE_SOCK_IO::send");
@@ -48,7 +48,7 @@ ACE_SOCK_IO::send (const void *buf, size_t n) const
 
 // Recv an n byte message from the connected socket.
 
-ASYS_INLINE ssize_t  
+ASYS_INLINE ssize_t
 ACE_SOCK_IO::recv (void *buf, size_t n) const
 {
   ACE_TRACE ("ACE_SOCK_IO::recv");
@@ -61,17 +61,17 @@ ACE_SOCK_IO::recv (void *buf, size_t n) const
 
 // Send a vector of n byte messages to the connected socket.
 
-ASYS_INLINE ssize_t  
-ACE_SOCK_IO::send (const iovec iov[], size_t n) const
+ASYS_INLINE ssize_t
+ACE_SOCK_IO::sendv (const iovec iov[], size_t n) const
 {
-  ACE_TRACE ("ACE_SOCK_IO::send");
+  ACE_TRACE ("ACE_SOCK_IO::sendv");
   return ACE_OS::sendv (this->get_handle (), iov, n);
 }
 
-ASYS_INLINE ssize_t  
-ACE_SOCK_IO::send_n (const iovec iov[], size_t n) const
+ASYS_INLINE ssize_t
+ACE_SOCK_IO::sendv_n (const iovec iov[], size_t n) const
 {
-  ACE_TRACE ("ACE_SOCK_IO::send");
+  ACE_TRACE ("ACE_SOCK_IO::sendv_n");
   return ACE::sendv_n (this->get_handle (),
                        iov,
                        n);
@@ -79,10 +79,10 @@ ACE_SOCK_IO::send_n (const iovec iov[], size_t n) const
 
 // Recv an n byte message from the connected socket.
 
-ASYS_INLINE ssize_t  
-ACE_SOCK_IO::recv (iovec iov[], size_t n) const
+ASYS_INLINE ssize_t
+ACE_SOCK_IO::recvv_n (iovec iov[], size_t n) const
 {
-  ACE_TRACE ("ACE_SOCK_IO::recv");
+  ACE_TRACE ("ACE_SOCK_IO::recvv_n");
   return ACE_OS::recvv (this->get_handle (), iov, n);
 }
 
@@ -91,7 +91,7 @@ ACE_SOCK_IO::send (const void *buf, size_t n,
 		   ACE_OVERLAPPED *overlapped) const
 {
   ACE_TRACE ("ACE_SOCK_IO::send");
-  return ACE_OS::write (this->get_handle (), 
+  return ACE_OS::write (this->get_handle (),
 			(const char *) buf, n,
 			overlapped);
 }
@@ -105,7 +105,7 @@ ACE_SOCK_IO::recv (void *buf, size_t n,
 		       overlapped);
 }
 
-ASYS_INLINE ssize_t 
+ASYS_INLINE ssize_t
 ACE_SOCK_IO::send (const void *buf,
                    size_t len,
                    int flags,
@@ -115,7 +115,7 @@ ACE_SOCK_IO::send (const void *buf,
   return ACE::send (this->get_handle (), buf, len, flags, timeout);
 }
 
-ASYS_INLINE ssize_t 
+ASYS_INLINE ssize_t
 ACE_SOCK_IO::recv (void *buf,
                    size_t len,
                    const ACE_Time_Value *timeout) const
@@ -124,7 +124,7 @@ ACE_SOCK_IO::recv (void *buf,
   return ACE::recv (this->get_handle (), buf, len, timeout);
 }
 
-ASYS_INLINE ssize_t 
+ASYS_INLINE ssize_t
 ACE_SOCK_IO::send (const void *buf,
                    size_t len,
                    const ACE_Time_Value *timeout) const
@@ -133,7 +133,7 @@ ACE_SOCK_IO::send (const void *buf,
   return ACE::send (this->get_handle (), buf, len, timeout);
 }
 
-ASYS_INLINE ssize_t 
+ASYS_INLINE ssize_t
 ACE_SOCK_IO::recv (void *buf,
                    size_t len,
                    int flags,