ChangeLogTag:Wed May 23 22:00:32 UTC 2007 Steve Huston <shuston@riverace.com>

6 files changed, 33 insertions, 11 deletions

diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index 6b3e74fbd7a..e3f240a1ded 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,21 @@
+Wed May 23 22:00:32 UTC 2007  Steve Huston  <shuston@riverace.com>
+
+        * ace/Pipe.cpp (send, recv):
+        * ace/SOCK_IO.cpp (send, recv): Use ACE_Utils::truncate_cast properly
+          to get an int, not a size_t, for the iovec count. Fixes Win64
+          compile warnings.
+
+        * ace/Log_Msg_IPC.cpp (log): Truncate the payload length down to an
+          ACE_CDR::ULong to resolve 64-bit warnings. If we desire logging
+          payloads larger than 4GB, this will need to be changed.
+
+        * ace/Local_Tokens.inl (ACE_Token_Name::name): Use size_t for a string
+          length, not int.
+
+        * ace/Filecache.cpp: When doing calculations based on
+          ACE_Filecache::size_ use its type, ACE_OFF_T, rather than u_long.
+          Keeps types consistent across platforms.
+
 Wed May 23 19:42:50 UTC 2007  Gan Deng  <gan.deng@vanderbilt.edu>
 
         * bin/ciao_tests.lst
diff --git a/ACE/ace/Filecache.cpp b/ACE/ace/Filecache.cpp
index f00d34b888f..04b73baa46e 100644
--- a/ACE/ace/Filecache.cpp
+++ b/ACE/ace/Filecache.cpp
@@ -313,7 +313,7 @@ ACE_Filecache::remove (const ACE_TCHAR *filename)
 {
   ACE_Filecache_Object *handle = 0;
 
-  u_long loc = ACE::hash_pjw (filename) % this->size_;
+  ACE_OFF_T loc = ACE::hash_pjw (filename) % this->size_;
   ACE_SYNCH_RW_MUTEX &hashlock = this->hash_lock_[loc];
   // ACE_SYNCH_RW_MUTEX &filelock = this->file_lock_[loc];
 
@@ -336,7 +336,7 @@ ACE_Filecache::fetch (const ACE_TCHAR *filename, int mapit)
 {
   ACE_Filecache_Object *handle = 0;
 
-  u_long loc = ACE::hash_pjw (filename) % this->size_;
+  ACE_OFF_T loc = ACE::hash_pjw (filename) % this->size_;
   ACE_SYNCH_RW_MUTEX &hashlock = this->hash_lock_[loc];
   ACE_SYNCH_RW_MUTEX &filelock = this->file_lock_[loc];
 
@@ -384,7 +384,7 @@ ACE_Filecache::create (const ACE_TCHAR *filename, int size)
 {
   ACE_Filecache_Object *handle = 0;
 
-  u_long loc = ACE::hash_pjw (filename) % this->size_;
+  ACE_OFF_T loc = ACE::hash_pjw (filename) % this->size_;
   ACE_SYNCH_RW_MUTEX &filelock = this->file_lock_[loc];
 
   ACE_NEW_RETURN (handle,
@@ -401,7 +401,7 @@ ACE_Filecache::finish (ACE_Filecache_Object *&file)
   if (file == 0)
     return file;
 
-  u_long loc = ACE::hash_pjw (file->filename_) % this->size_;
+  ACE_OFF_T loc = ACE::hash_pjw (file->filename_) % this->size_;
   ACE_SYNCH_RW_MUTEX &hashlock = this->hash_lock_[loc];
 
   if (file != 0)
diff --git a/ACE/ace/Local_Tokens.inl b/ACE/ace/Local_Tokens.inl
index ddbbf0343cf..62f5e2cbfa0 100644
--- a/ACE/ace/Local_Tokens.inl
+++ b/ACE/ace/Local_Tokens.inl
@@ -225,7 +225,7 @@ ACE_Token_Name::name (const ACE_TCHAR *new_name)
   if (new_name == 0)
     new_name = ACE_LIB_TEXT ("no name");
 
-  int n = ACE_OS::strlen (new_name) + 1;
+  size_t n = ACE_OS::strlen (new_name) + 1;
 
   if (n >= ACE_MAXTOKENNAMELEN)
     n = ACE_MAXTOKENNAMELEN - 1;
diff --git a/ACE/ace/Log_Msg_IPC.cpp b/ACE/ace/Log_Msg_IPC.cpp
index 6c80dce2297..eb88c7ed2c2 100644
--- a/ACE/ace/Log_Msg_IPC.cpp
+++ b/ACE/ace/Log_Msg_IPC.cpp
@@ -3,6 +3,7 @@
 #include "ace/Log_Msg_IPC.h"
 #include "ace/Log_Record.h"
 #include "ace/CDR_Stream.h"
+#include "ace/Truncate.h"
 
 ACE_RCSID(ace, Log_Msg_IPC, "$Id$")
 
@@ -61,8 +62,11 @@ ACE_Log_Msg_IPC::log (ACE_Log_Record &log_record)
   ACE_OutputCDR payload (max_payload_size);
   payload << log_record;
 
-  // Get the number of bytes used by the CDR stream.
-  ACE_CDR::ULong length = payload.total_length ();
+  // Get the number of bytes used by the CDR stream. If it becomes desireable
+  // to support payloads more than 4GB, this field will need to be changed
+  // to a 64-bit value.
+  ACE_CDR::ULong length =
+    ACE_Utils::truncate_cast<ACE_CDR::ULong> (payload.total_length ());
 
   // Send a header so the receiver can determine the byte order and
   // size of the incoming CDR stream.
diff --git a/ACE/ace/Pipe.cpp b/ACE/ace/Pipe.cpp
index 3d91ce9ecce..99f38a02dea 100644
--- a/ACE/ace/Pipe.cpp
+++ b/ACE/ace/Pipe.cpp
@@ -260,7 +260,7 @@ ACE_Pipe::send (size_t n, ...) const
 {
   ACE_TRACE ("ACE_Pipe::send");
   va_list argp;
-  size_t total_tuples = n / 2;
+  int total_tuples = ACE_Utils::truncate_cast<int> (n / 2);
   iovec *iovp;
 #if defined (ACE_HAS_ALLOCA)
   iovp = (iovec *) alloca (total_tuples * sizeof (iovec));
@@ -306,7 +306,7 @@ ACE_Pipe::recv (size_t n, ...) const
 {
   ACE_TRACE ("ACE_Pipe::recv");
   va_list argp;
-  size_t total_tuples = n / 2;
+  int total_tuples = ACE_Utils::truncate_cast<int> (n / 2);
   iovec *iovp;
 #if defined (ACE_HAS_ALLOCA)
   iovp = (iovec *) alloca (total_tuples * sizeof (iovec));
diff --git a/ACE/ace/SOCK_IO.cpp b/ACE/ace/SOCK_IO.cpp
index f7530aaf9f0..10dfe308df5 100644
--- a/ACE/ace/SOCK_IO.cpp
+++ b/ACE/ace/SOCK_IO.cpp
@@ -110,7 +110,7 @@ ACE_SOCK_IO::send (size_t n, ...) const
   ACE_TRACE ("ACE_SOCK_IO::send");
 
   va_list argp;
-  int total_tuples = ACE_Utils::truncate_cast<size_t> (n / 2);
+  int total_tuples = ACE_Utils::truncate_cast<int> (n / 2);
   iovec *iovp = 0;
 #if defined (ACE_HAS_ALLOCA)
   iovp = (iovec *) alloca (total_tuples * sizeof (iovec));
@@ -150,7 +150,7 @@ ACE_SOCK_IO::recv (size_t n, ...) const
   ACE_TRACE ("ACE_SOCK_IO::recv");
 
   va_list argp;
-  int total_tuples = ACE_Utils::truncate_cast<size_t> (n / 2);
+  int total_tuples = ACE_Utils::truncate_cast<int> (n / 2);
   iovec *iovp;
 #if defined (ACE_HAS_ALLOCA)
   iovp = (iovec *) alloca (total_tuples * sizeof (iovec));