summaryrefslogtreecommitdiff
path: root/ace/MEM_IO.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'ace/MEM_IO.cpp')
-rw-r--r--ace/MEM_IO.cpp12
1 files changed, 5 insertions, 7 deletions
diff --git a/ace/MEM_IO.cpp b/ace/MEM_IO.cpp
index 7a9616f5220..a3ebd3a839e 100644
--- a/ace/MEM_IO.cpp
+++ b/ace/MEM_IO.cpp
@@ -12,11 +12,9 @@
ACE_RCSID(ace, MEM_IO, "$Id$")
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
ACE_ALLOC_HOOK_DEFINE(ACE_MEM_IO)
-ACE_Reactive_MEM_IO::~ACE_Reactive_MEM_IO (void)
+ACE_Reactive_MEM_IO::~ACE_Reactive_MEM_IO ()
{
}
@@ -273,6 +271,8 @@ ACE_MT_MEM_IO::recv_buf (ACE_MEM_SAP_Node *&buf,
return buf->size ();
return -1;
}
+
+ ACE_NOTREACHED (return 0;)
}
ssize_t
@@ -432,11 +432,11 @@ ACE_MEM_IO::recvv (iovec *io_vec,
break;
}
- int inlen;
+ u_long inlen;
if (ACE_OS::ioctl (this->get_handle (),
FIONREAD,
- &inlen) == -1)
+ (u_long *) &inlen) == -1)
return -1;
else if (inlen > 0)
{
@@ -536,6 +536,4 @@ ACE_MEM_IO::recv (size_t n, ...) const
}
#endif /* 0 */
-ACE_END_VERSIONED_NAMESPACE_DECL
-
#endif /* ACE_HAS_POSITION_INDEPENDENT_POINTERS == 1 */