Get rid of a bunch of 64bit warnings on Sun

18 files changed, 53 insertions, 47 deletions

diff --git a/cpp/demo/Freeze/backup/Client.cpp b/cpp/demo/Freeze/backup/Client.cpp
index 7ef3078d858..231d772044d 100644
--- a/cpp/demo/Freeze/backup/Client.cpp
+++ b/cpp/demo/Freeze/backup/Client.cpp
@@ -38,7 +38,7 @@ main(int argc, char* argv[])
     Freeze::ConnectionPtr connection = createConnection(communicator, "backup");
     IntLongMap m(connection, "IntLongMap", true);
     
-    const size_t size = 10000;
+    const int size = 10000;
 
     if(m.size() == 0)
     {	
@@ -48,7 +48,7 @@ main(int argc, char* argv[])
 	Time time = Time::now();
 	Int64 ms = time.toMilliSeconds();
 
-	for(size_t i = 0; i < size; ++i)
+	for(int i = 0; i < size; ++i)
 	{
 	    m.insert(IntLongMap::value_type(i, ms));
 	}
@@ -59,7 +59,7 @@ main(int argc, char* argv[])
 
     for(;;)
     {
-	size_t count = 0;
+	int count = 0;
 
 	TransactionHolder txHolder(connection);
 	Time time = Time::now();
diff --git a/cpp/demo/Ice/throughput/Client.cpp b/cpp/demo/Ice/throughput/Client.cpp
index c1377c9baf6..90ca86f48ea 100644
--- a/cpp/demo/Ice/throughput/Client.cpp
+++ b/cpp/demo/Ice/throughput/Client.cpp
@@ -283,12 +283,12 @@ run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator)
 		    }
 		    case '2':
 		    {
-		        wireSize = stringSeq[0].size();
+		        wireSize = static_cast<int>(stringSeq[0].size());
 		    	break;
 		    }
 		    case '3':
 		    {
-		    	wireSize = structSeq[0].s.size();
+		    	wireSize = static_cast<int>(structSeq[0].s.size());
 			wireSize += 8; // Size of double on the wire.
 		    	break;
 		    }
diff --git a/cpp/src/FreezeScript/Data.cpp b/cpp/src/FreezeScript/Data.cpp
index 5d84f5d4343..94c09d3caed 100644
--- a/cpp/src/FreezeScript/Data.cpp
+++ b/cpp/src/FreezeScript/Data.cpp
@@ -1654,7 +1654,7 @@ FreezeScript::SequenceData::destroy()
 void
 FreezeScript::SequenceData::marshal(const Ice::OutputStreamPtr& out) const
 {
-    out->writeSize(_elements.size());
+    out->writeSize(static_cast<int>(_elements.size()));
     for(DataList::const_iterator p = _elements.begin(); p != _elements.end(); ++p)
     {
         (*p)->marshal(out);
@@ -1728,14 +1728,14 @@ FreezeScript::SequenceData::getElements()
 FreezeScript::EnumData::EnumData(const Slice::EnumPtr& type, const ErrorReporterPtr& errorReporter, bool readOnly) :
     Data(errorReporter, readOnly), _type(type), _value(0)
 {
-    _count = static_cast<long>(type->getEnumerators().size());
+    _count = static_cast<int>(type->getEnumerators().size());
 }
 
 FreezeScript::EnumData::EnumData(const Slice::EnumPtr& type, const ErrorReporterPtr& errorReporter, bool readOnly,
                                  Ice::Int value) :
     Data(errorReporter, readOnly), _type(type), _value(value)
 {
-    _count = static_cast<long>(type->getEnumerators().size());
+    _count = static_cast<int>(type->getEnumerators().size());
 }
 
 FreezeScript::DataPtr
@@ -2034,7 +2034,7 @@ FreezeScript::DictionaryData::destroy()
 void
 FreezeScript::DictionaryData::marshal(const Ice::OutputStreamPtr& out) const
 {
-    out->writeSize(_map.size());
+    out->writeSize(static_cast<int>(_map.size()));
     for(DataMap::const_iterator p = _map.begin(); p != _map.end(); ++p)
     {
         p->first->marshal(out);
diff --git a/cpp/src/FreezeScript/Transformer.cpp b/cpp/src/FreezeScript/Transformer.cpp
index 6546b27cae5..c85cc3f9e10 100644
--- a/cpp/src/FreezeScript/Transformer.cpp
+++ b/cpp/src/FreezeScript/Transformer.cpp
@@ -1901,7 +1901,8 @@ FreezeScript::RecordDescriptor::execute(const SymbolTablePtr& sym)
             {
                 Ice::ByteSeq outKeyBytes, outValueBytes;
                 transformRecord(inKeyBytes, inValueBytes, outKeyBytes, outValueBytes);
-                Dbt dbNewKey(&outKeyBytes[0], outKeyBytes.size()), dbNewValue(&outValueBytes[0], outValueBytes.size());
+                Dbt dbNewKey(&outKeyBytes[0], static_cast<unsigned>(outKeyBytes.size())),
+			     dbNewValue(&outValueBytes[0], static_cast<unsigned>(outValueBytes.size()));
                 if(_info->newDb->put(_info->newDbTxn, &dbNewKey, &dbNewValue, DB_NOOVERWRITE) == DB_KEYEXIST)
                 {
                     _info->errorReporter->error("duplicate key encountered");
diff --git a/cpp/src/Ice/BasicStream.cpp b/cpp/src/Ice/BasicStream.cpp
index 211ac178d12..0195d00dedc 100644
--- a/cpp/src/Ice/BasicStream.cpp
+++ b/cpp/src/Ice/BasicStream.cpp
@@ -185,7 +185,7 @@ IceInternal::BasicStream::startSeq(int numElements, int minSize)
     sd->previous = _seqDataStack;
     _seqDataStack = sd;
 
-    int bytesLeft = b.end() - i;
+    int bytesLeft = static_cast<int>(b.end() - i);
     if(_seqDataStack == 0) // Outermost sequence
     {
 	//
@@ -211,7 +211,7 @@ IceInternal::BasicStream::startSeq(int numElements, int minSize)
 void
 IceInternal::BasicStream::checkSeq()
 {
-    checkSeq(b.end() - i);
+    checkSeq(static_cast<int>(b.end() - i));
 }
 
 void
@@ -252,7 +252,7 @@ IceInternal::BasicStream::endSeq(int sz)
 void
 IceInternal::BasicStream::checkFixedSeq(int numElements, int elemSize)
 {
-    int bytesLeft = b.end() - i;
+    int bytesLeft = static_cast<int>(b.end() - i);
     if(_seqDataStack == 0) // Outermost sequence
     {
 	//
@@ -495,7 +495,7 @@ Int
 IceInternal::BasicStream::getReadEncapsSize()
 {
     assert(_currentReadEncaps);
-    return _currentReadEncaps->sz - sizeof(Int) - 2;
+    return _currentReadEncaps->sz - static_cast<Int>(sizeof(Int)) - 2;
 }
 
 void
@@ -832,7 +832,7 @@ IceInternal::BasicStream::read(vector<Short>& v)
     readSize(sz);
     if(sz > 0)
     {
-	checkFixedSeq(sz, sizeof(Short));
+	checkFixedSeq(sz, static_cast<int>(sizeof(Short)));
 	Container::iterator begin = i;
 	i += sz * static_cast<int>(sizeof(Short));
 	v.resize(sz);
@@ -933,7 +933,7 @@ IceInternal::BasicStream::read(vector<Int>& v)
     readSize(sz);
     if(sz > 0)
     {
-	checkFixedSeq(sz, sizeof(Int));
+	checkFixedSeq(sz, static_cast<int>(sizeof(Int)));
 	Container::iterator begin = i;
 	i += sz * static_cast<int>(sizeof(Int));
 	v.resize(sz);
@@ -1056,7 +1056,7 @@ IceInternal::BasicStream::read(vector<Long>& v)
     readSize(sz);
     if(sz > 0)
     {
-	checkFixedSeq(sz, sizeof(Long));
+	checkFixedSeq(sz, static_cast<int>(sizeof(Long)));
 	Container::iterator begin = i;
 	i += sz * static_cast<int>(sizeof(Long));
 	v.resize(sz);
@@ -1163,7 +1163,7 @@ IceInternal::BasicStream::read(vector<Float>& v)
     readSize(sz);
     if(sz > 0)
     {
-	checkFixedSeq(sz, sizeof(Float));
+	checkFixedSeq(sz, static_cast<int>(sizeof(Float)));
 	Container::iterator begin = i;
 	i += sz * static_cast<int>(sizeof(Float));
 	v.resize(sz);
@@ -1286,7 +1286,7 @@ IceInternal::BasicStream::read(vector<Double>& v)
     readSize(sz);
     if(sz > 0)
     {
-	checkFixedSeq(sz, sizeof(Double));
+	checkFixedSeq(sz, static_cast<int>(sizeof(Double)));
 	Container::iterator begin = i;
 	i += sz * static_cast<int>(sizeof(Double));
 	v.resize(sz);
diff --git a/cpp/src/Ice/Service.cpp b/cpp/src/Ice/Service.cpp
index d63484dbe55..fd18988d91c 100755
--- a/cpp/src/Ice/Service.cpp
+++ b/cpp/src/Ice/Service.cpp
@@ -1346,7 +1346,7 @@ Ice::Service::runDaemon(int argc, char* argv[])
             size_t pos = 0;
             while(pos < sizeof(msg))
             {
-                int n = read(fds[0], &msg[pos], sizeof(msg) - pos);
+                int n = read(fds[0], &msg[pos], static_cast<int>(sizeof(msg) - pos));
                 if(n == -1)
                 {
                     if(IceInternal::interrupted())
@@ -1444,7 +1444,7 @@ Ice::Service::runDaemon(int argc, char* argv[])
             // conveniently allows the Ice.PrintProcessId property to work as expected.
             //
             FD_ZERO(&fdsToClose);
-            fdMax = sysconf(_SC_OPEN_MAX);
+            fdMax = static_cast<int>(sysconf(_SC_OPEN_MAX));
             if(fdMax <= 0)
             {
                 SyscallException ex(__FILE__, __LINE__);
@@ -1596,7 +1596,7 @@ Ice::Service::runDaemon(int argc, char* argv[])
         size_t pos = 0;
         while(len > 0)
         {
-            int n = write(fds[1], &msg[pos], len);
+            int n = write(fds[1], &msg[pos], static_cast<int>(len));
             if(n == -1)
             {
                 if(IceInternal::interrupted())
diff --git a/cpp/src/Ice/TcpTransceiver.cpp b/cpp/src/Ice/TcpTransceiver.cpp
index c6590341572..16d4079c3ea 100644
--- a/cpp/src/Ice/TcpTransceiver.cpp
+++ b/cpp/src/Ice/TcpTransceiver.cpp
@@ -78,7 +78,8 @@ IceInternal::TcpTransceiver::shutdownReadWrite()
 void
 IceInternal::TcpTransceiver::write(Buffer& buf, int timeout)
 {
-    Buffer::Container::difference_type packetSize = buf.b.end() - buf.i;
+    Buffer::Container::difference_type packetSize = 
+        static_cast<Buffer::Container::difference_type>(buf.b.end() - buf.i);
     
 #ifdef _WIN32
     //
@@ -184,7 +185,7 @@ IceInternal::TcpTransceiver::write(Buffer& buf, int timeout)
 
 	if(packetSize > buf.b.end() - buf.i)
 	{
-	    packetSize = buf.b.end() - buf.i;
+	    packetSize = static_cast<Buffer::Container::difference_type>(buf.b.end() - buf.i);
 	}
     }
 }
@@ -192,7 +193,8 @@ IceInternal::TcpTransceiver::write(Buffer& buf, int timeout)
 void
 IceInternal::TcpTransceiver::read(Buffer& buf, int timeout)
 {
-    Buffer::Container::difference_type packetSize = buf.b.end() - buf.i;
+    Buffer::Container::difference_type packetSize = 
+        static_cast<Buffer::Container::difference_type>(buf.b.end() - buf.i);
     
     while(buf.i != buf.b.end())
     {
@@ -307,7 +309,7 @@ IceInternal::TcpTransceiver::read(Buffer& buf, int timeout)
 
 	if(packetSize > buf.b.end() - buf.i)
 	{
-	    packetSize = buf.b.end() - buf.i;
+	    packetSize = static_cast<Buffer::Container::difference_type>(buf.b.end() - buf.i);
 	}
     }
 }
diff --git a/cpp/src/Ice/UdpTransceiver.cpp b/cpp/src/Ice/UdpTransceiver.cpp
index 11c7c971365..2000871ab7e 100644
--- a/cpp/src/Ice/UdpTransceiver.cpp
+++ b/cpp/src/Ice/UdpTransceiver.cpp
@@ -416,7 +416,7 @@ IceInternal::UdpTransceiver::setBufSize(const InstancePtr& instance)
 	{
 	    Warning out(_logger);
 	    out << "UDP " << direction << " buffer size: requested size of " << sizeRequested << " adjusted to ";
-	    sizeRequested = min(messageSizeMax, static_cast<size_t>(_maxPacketSize)) + _udpOverhead;
+	    sizeRequested = min(static_cast<int>(messageSizeMax), _maxPacketSize) + _udpOverhead;
 	    out << sizeRequested << " (Ice.MessageSizeMax takes precendence)";
 	}
 	    
diff --git a/cpp/src/IcePack/Activator.cpp b/cpp/src/IcePack/Activator.cpp
index 5d4921e1039..0c50e54627f 100644
--- a/cpp/src/IcePack/Activator.cpp
+++ b/cpp/src/IcePack/Activator.cpp
@@ -621,7 +621,7 @@ Activator::activate(const string& name,
     assert(i == argc);
     argv[argc] = 0;
     
-    int envCount = envs.size();
+    int envCount = static_cast<int>(envs.size());
     char** envArray = new char*[envCount];
     i = 0;
     for(StringSeq::const_iterator q = envs.begin(); q != envs.end(); ++q)
diff --git a/cpp/src/IcePatch2/ClientUtil.cpp b/cpp/src/IcePatch2/ClientUtil.cpp
index e5bbed6d9ba..522fbfdef53 100755
--- a/cpp/src/IcePatch2/ClientUtil.cpp
+++ b/cpp/src/IcePatch2/ClientUtil.cpp
@@ -792,7 +792,7 @@ IcePatch2::Patcher::updateFilesInternal(const FileInfoSeq& files, const Decompre
 			throw ": cannot write `" + pathBZ2 + "':\n" + lastError();
 		    }
 		
-		    pos += bytes.size();
+		    pos += static_cast<int>(bytes.size());
 		    updated += bytes.size();
 		
 		    if(!_feedback->patchProgress(pos, p->size, updated, total))
diff --git a/cpp/src/IcePatch2/Util.cpp b/cpp/src/IcePatch2/Util.cpp
index 7cc6b1442e7..165bfb4f084 100644
--- a/cpp/src/IcePatch2/Util.cpp
+++ b/cpp/src/IcePatch2/Util.cpp
@@ -602,7 +602,7 @@ IcePatch2::compressBytesToFile(const string& pa, const ByteSeq& bytes, Int pos)
 	throw ex;
     }
 
-    BZ2_bzWrite(&bzError, bzFile, const_cast<Byte*>(&bytes[pos]), bytes.size() - pos);
+    BZ2_bzWrite(&bzError, bzFile, const_cast<Byte*>(&bytes[pos]), static_cast<int>(bytes.size() - pos));
     if(bzError != BZ_OK)
     {
 	string ex = "BZ2_bzWrite failed";
@@ -862,7 +862,7 @@ getFileInfoSeqInt(const string& basePath, const string& relPath, int compress, G
 			//
 			const string pathBZ2Temp = path + ".bz2temp";
 
-			compressBytesToFile(pathBZ2Temp, bytes, relPath.size());
+			compressBytesToFile(pathBZ2Temp, bytes, static_cast<Int>(relPath.size()));
 			
 			rename(pathBZ2Temp, pathBZ2);
 
@@ -872,7 +872,7 @@ getFileInfoSeqInt(const string& basePath, const string& relPath, int compress, G
 			}
 		    }
 
-		    info.size = bufBZ2.st_size;
+		    info.size = static_cast<Int>(bufBZ2.st_size);
 		}
 	    }
 
diff --git a/cpp/src/IceSSL/SslClientTransceiver.cpp b/cpp/src/IceSSL/SslClientTransceiver.cpp
index e213309a792..e287c16d70b 100644
--- a/cpp/src/IceSSL/SslClientTransceiver.cpp
+++ b/cpp/src/IceSSL/SslClientTransceiver.cpp
@@ -37,7 +37,8 @@ IceSSL::SslClientTransceiver::write(Buffer& buf, int timeout)
     int totalBytesWritten = 0;
     int bytesWritten = 0;
 
-    Buffer::Container::difference_type packetSize = buf.b.end() - buf.i;
+    Buffer::Container::difference_type packetSize = 
+        static_cast<Buffer::Container::difference_type>(buf.b.end() - buf.i);
 
 #ifdef _WIN32
     //
@@ -95,7 +96,7 @@ IceSSL::SslClientTransceiver::write(Buffer& buf, int timeout)
 
                     if(packetSize > buf.b.end() - buf.i)
                     {
-                        packetSize = buf.b.end() - buf.i;
+                        packetSize = static_cast<Buffer::Container::difference_type>(buf.b.end() - buf.i);
                     }
                 }
                 continue;
diff --git a/cpp/src/IceSSL/SslServerTransceiver.cpp b/cpp/src/IceSSL/SslServerTransceiver.cpp
index 8c966d57baf..4acbd506500 100644
--- a/cpp/src/IceSSL/SslServerTransceiver.cpp
+++ b/cpp/src/IceSSL/SslServerTransceiver.cpp
@@ -39,7 +39,8 @@ IceSSL::SslServerTransceiver::write(Buffer& buf, int timeout)
     int totalBytesWritten = 0;
     int bytesWritten = 0;
 
-    Buffer::Container::difference_type packetSize = buf.b.end() - buf.i;
+    Buffer::Container::difference_type packetSize = 
+        static_cast<Buffer::Container::difference_type>(buf.b.end() - buf.i);
 
 #ifdef _WIN32
     //
@@ -94,7 +95,7 @@ IceSSL::SslServerTransceiver::write(Buffer& buf, int timeout)
 
                 if(packetSize > buf.b.end() - buf.i)
                 {
-                    packetSize = buf.b.end() - buf.i;
+                    packetSize = static_cast<Buffer::Container::difference_type>(buf.b.end() - buf.i);
                 }
                 continue;
             }
diff --git a/cpp/src/IceSSL/SslTransceiver.cpp b/cpp/src/IceSSL/SslTransceiver.cpp
index 3be15240b17..b0ae47f270c 100644
--- a/cpp/src/IceSSL/SslTransceiver.cpp
+++ b/cpp/src/IceSSL/SslTransceiver.cpp
@@ -146,7 +146,8 @@ IceSSL::SslTransceiver::read(Buffer& buf, int timeout)
 
     _plugin->registerThread();
 
-    Buffer::Container::difference_type packetSize = buf.b.end() - buf.i;
+    Buffer::Container::difference_type packetSize = 
+        static_cast<Buffer::Container::difference_type>(buf.b.end() - buf.i);
     int totalBytesRead = 0;
     int bytesRead;
 
@@ -213,7 +214,7 @@ IceSSL::SslTransceiver::read(Buffer& buf, int timeout)
 
                     if(packetSize > buf.b.end() - buf.i)
                     {
-                        packetSize = buf.b.end() - buf.i;
+                        packetSize = static_cast<Buffer::Container::difference_type>(buf.b.end() - buf.i);
                     }
                 }
                 continue;
diff --git a/cpp/src/IceUtil/GC.cpp b/cpp/src/IceUtil/GC.cpp
index d668cf371ba..a6c8c4d774b 100644
--- a/cpp/src/IceUtil/GC.cpp
+++ b/cpp/src/IceUtil/GC.cpp
@@ -156,7 +156,7 @@ IceUtil::GC::collectGarbage()
     if(_statsCallback)
     {
 	t = Time::now();
-	stats.examined = gcObjects.size();
+	stats.examined = static_cast<int>(gcObjects.size());
     }
 
     //
@@ -241,7 +241,7 @@ IceUtil::GC::collectGarbage()
     if(_statsCallback)
     {
 	stats.time = Time::now() - t;
-	stats.collected = counts.size();
+	stats.collected = static_cast<int>(counts.size());
 	_statsCallback(stats);
     }
 
diff --git a/cpp/src/IceXML/Parser.cpp b/cpp/src/IceXML/Parser.cpp
index 849ba5e221c..dfc9cd6cefa 100644
--- a/cpp/src/IceXML/Parser.cpp
+++ b/cpp/src/IceXML/Parser.cpp
@@ -394,7 +394,7 @@ IceXML::Parser::parse(istream& in, Handler& handler)
             {
                 isFinal = 1;
             }
-            if(XML_Parse(parser, buff, in.gcount(), isFinal) != 1)
+            if(XML_Parse(parser, buff, static_cast<int>(in.gcount()), isFinal) != 1)
             {
                 handler.error(XML_ErrorString(XML_GetErrorCode(parser)), XML_GetCurrentLineNumber(parser),
                               XML_GetCurrentColumnNumber(parser));
diff --git a/cpp/src/Slice/Checksum.cpp b/cpp/src/Slice/Checksum.cpp
index a221506fcf6..500d3a62c60 100644
--- a/cpp/src/Slice/Checksum.cpp
+++ b/cpp/src/Slice/Checksum.cpp
@@ -299,7 +299,7 @@ Slice::ChecksumVisitor::typeToString(const TypePtr& type)
 void
 Slice::ChecksumVisitor::updateMap(const string& scoped, const string& data)
 {
-    IceUtil::MD5 md5(reinterpret_cast<const unsigned char*>(data.c_str()), data.size());
+    IceUtil::MD5 md5(reinterpret_cast<const unsigned char*>(data.c_str()), static_cast<int>(data.size()));
     vector<unsigned char> bytes;
     bytes.resize(16);
     md5.getDigest(reinterpret_cast<unsigned char*>(&bytes[0]));
diff --git a/cpp/src/Slice/Preprocessor.cpp b/cpp/src/Slice/Preprocessor.cpp
index 105913fc78d..b05881b5d0d 100644
--- a/cpp/src/Slice/Preprocessor.cpp
+++ b/cpp/src/Slice/Preprocessor.cpp
@@ -135,7 +135,7 @@ Slice::Preprocessor::printMakefileDependencies(Language lang)
         case CPlusPlus:
 	{
 	    char buf[1024];
-	    while(fgets(buf, sizeof(buf), cppHandle) != NULL)
+	    while(fgets(buf, static_cast<int>(sizeof(buf)), cppHandle) != NULL)
 	    {
 	        fputs(buf, stdout);
 	    }
@@ -152,7 +152,7 @@ Slice::Preprocessor::printMakefileDependencies(Language lang)
             //
             string deps;
 	    char buf[1024];
-	    while(fgets(buf, sizeof(buf), cppHandle) != NULL)
+	    while(fgets(buf, static_cast<int>(sizeof(buf)), cppHandle) != NULL)
 	    {
                 deps.append(buf, strlen(buf));
             }
@@ -205,7 +205,7 @@ Slice::Preprocessor::printMakefileDependencies(Language lang)
 	    // Change .cpp suffix to .cs suffix.
 	    //
 	    char buf[1024];
-	    while(fgets(buf, sizeof(buf), cppHandle) != NULL)
+	    while(fgets(buf, static_cast<int>(sizeof(buf)), cppHandle) != NULL)
 	    {
 		char* dot;
 		char* colon = strchr(buf, ':');
@@ -235,8 +235,8 @@ Slice::Preprocessor::printMakefileDependencies(Language lang)
 	    //

 	    // Change .cpp suffix to .vb suffix.

 	    //

-	    char buf[1024];

-	    while(fgets(buf, sizeof(buf), cppHandle) != NULL)

+	    char buf[1024];
+	    while(fgets(buf, static_cast<int>(sizeof(buf)), cppHandle) != NULL)

 	    {

 		char* dot;

 		char* colon = strchr(buf, ':');