summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--ace/SOCK_IO.h2
-rw-r--r--ace/SOCK_IO.inl4
3 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index b7bb7aa32b9..d8b1a4290d2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Oct 14 11:44:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>
+
+ * ace/SOCK_IO.{h,inl}:
+ 64bit fix
+
Fri Oct 14 10:52:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>
* ace/SSL/SSL_Asynch_BIO.{h,cpp}:
diff --git a/ace/SOCK_IO.h b/ace/SOCK_IO.h
index 08555ae5ea1..650095ebf39 100644
--- a/ace/SOCK_IO.h
+++ b/ace/SOCK_IO.h
@@ -114,7 +114,7 @@ public:
/// Send an <iovec> of size <n> to the connected socket.
ssize_t sendv (const iovec iov[],
- int n,
+ size_t n,
const ACE_Time_Value *timeout = 0) const;
/// Same as above. Deprecated.
diff --git a/ace/SOCK_IO.inl b/ace/SOCK_IO.inl
index f573bc5d26b..96950c2cd99 100644
--- a/ace/SOCK_IO.inl
+++ b/ace/SOCK_IO.inl
@@ -115,7 +115,7 @@ ACE_SOCK_IO::send (const void *buf,
ACE_INLINE ssize_t
ACE_SOCK_IO::sendv (const iovec iov[],
- int n,
+ size_t n,
const ACE_Time_Value *timeout) const
{
ACE_TRACE ("ACE_SOCK_IO::sendv");
@@ -132,7 +132,7 @@ ACE_SOCK_IO::send (const iovec iov[],
{
ACE_TRACE ("ACE_SOCK_IO::send");
return this->sendv (iov,
- static_cast<int> (n),
+ n,
timeout);
}