Sun: 64 bit + CC 5.3 support

1 files changed, 14 insertions, 14 deletions

diff --git a/cpp/src/IceXML/StreamI.cpp b/cpp/src/IceXML/StreamI.cpp
index 343c99d1547..4ae72e53b1c 100644
--- a/cpp/src/IceXML/StreamI.cpp
+++ b/cpp/src/IceXML/StreamI.cpp
@@ -244,7 +244,7 @@ IceXML::StreamI::StreamI(const ::Ice::CommunicatorPtr& communicator, std::istrea
     bool errorsOccured = false;
     try
     {
-        ICE_XERCES_NS MemBufInputSource source((const XMLByte*)_content.data(), _content.size(), "inputsource");
+        ICE_XERCES_NS MemBufInputSource source((const XMLByte*)_content.data(), (unsigned int) _content.size(), "inputsource");
         parser.parse(source);
         if(parser.getErrorCount() > 0)
 	{
@@ -474,7 +474,7 @@ IceXML::StreamI::readEnum(const string& name, const ::Ice::StringSeq& table)
 
     endRead();
 
-    return p - table.begin();
+    return ::Ice::Int(p - table.begin());
 }
 
 void
@@ -492,7 +492,7 @@ IceXML::StreamI::writeByte(const string& name, ::Ice::Byte value)
 void
 IceXML::StreamI::writeByteSeq(const string& name, const ::Ice::ByteSeq& seq)
 {
-    startWriteSequence(name, seq.size());
+    startWriteSequence(name, ::Ice::Int(seq.size()));
     for(::Ice::ByteSeq::const_iterator p = seq.begin(); p != seq.end(); ++p)
     {
         startWriteSequenceElement();
@@ -600,7 +600,7 @@ IceXML::StreamI::writeBool(const string& name, bool value)
 void
 IceXML::StreamI::writeBoolSeq(const string& name, const ::Ice::BoolSeq& seq)
 {
-    startWriteSequence(name, seq.size());
+    startWriteSequence(name, ::Ice::Int(seq.size()));
     for(::Ice::BoolSeq::const_iterator p = seq.begin(); p != seq.end(); ++p)
     {
 	_os << se("e") << (*p ? "true" : "false") << ee;
@@ -661,7 +661,7 @@ IceXML::StreamI::writeShort(const string& name, ::Ice::Short value)
 void
 IceXML::StreamI::writeShortSeq(const string& name, const ::Ice::ShortSeq& seq)
 {
-    startWriteSequence(name, seq.size());
+    startWriteSequence(name, ::Ice::Int(seq.size()));
     for(::Ice::ShortSeq::const_iterator p = seq.begin(); p != seq.end(); ++p)
     {
 	_os << se("e") << *p << ee;
@@ -727,7 +727,7 @@ IceXML::StreamI::writeInt(const string& name, ::Ice::Int value)
 void
 IceXML::StreamI::writeIntSeq(const string& name, const ::Ice::IntSeq& seq)
 {
-    startWriteSequence(name, seq.size());
+    startWriteSequence(name, ::Ice::Int(seq.size()));
     for(::Ice::IntSeq::const_iterator p = seq.begin(); p != seq.end(); ++p)
     {
 	_os << se("e") << *p << ee;
@@ -788,7 +788,7 @@ IceXML::StreamI::writeLong(const string& name, ::Ice::Long value)
 void
 IceXML::StreamI::writeLongSeq(const string& name, const ::Ice::LongSeq& seq)
 {
-    startWriteSequence(name, seq.size());
+    startWriteSequence(name, ::Ice::Int(seq.size()));
     for(::Ice::LongSeq::const_iterator p = seq.begin(); p != seq.end(); ++p)
     {
 	_os << se("e") << *p << ee;
@@ -855,7 +855,7 @@ IceXML::StreamI::writeFloat(const string& name, ::Ice::Float value)
 void
 IceXML::StreamI::writeFloatSeq(const string& name, const ::Ice::FloatSeq& seq)
 {
-    startWriteSequence(name, seq.size());
+    startWriteSequence(name, ::Ice::Int(seq.size()));
     for(::Ice::FloatSeq::const_iterator p = seq.begin(); p != seq.end(); ++p)
     {
 	_os << se("e") << *p << ee;
@@ -916,7 +916,7 @@ IceXML::StreamI::writeDouble(const string& name, ::Ice::Double value)
 void
 IceXML::StreamI::writeDoubleSeq(const string& name, const ::Ice::DoubleSeq& seq)
 {
-    startWriteSequence(name, seq.size());
+    startWriteSequence(name, ::Ice::Int(seq.size()));
     for(::Ice::DoubleSeq::const_iterator p = seq.begin(); p != seq.end(); ++p)
     {
 	_os << se("e") << *p << ee;
@@ -983,7 +983,7 @@ IceXML::StreamI::writeString(const string& name, const string& value)
 void
 IceXML::StreamI::writeStringSeq(const string& name, const ::Ice::StringSeq& seq)
 {
-    startWriteSequence(name, seq.size());
+    startWriteSequence(name, ::Ice::Int(seq.size()));
     for(::Ice::StringSeq::const_iterator p = seq.begin(); p != seq.end(); ++p)
     {
 	_os << se("e");
@@ -1380,8 +1380,8 @@ void
 IceXML::StreamI::readAttributes(::std::string& id, ::std::string& type, ::std::string& href)
 {
     ICE_XERCES_NS DOMNamedNodeMap* attributes = _input->current->getAttributes();
-    int attrCount = attributes->getLength();
-    for(int i = 0; i < attrCount; i++)
+    size_t attrCount = attributes->getLength();
+    for(size_t i = 0; i < attrCount; i++)
     {
 	ICE_XERCES_NS DOMNode* attribute = attributes->item(i);
 	string name = toString(attribute->getNodeName());
@@ -1404,8 +1404,8 @@ IceXML::StreamI::readAttributes(::std::string& id, ::std::string& type, ::std::s
 IceXML::StreamI::readLength()
 {
     ICE_XERCES_NS DOMNamedNodeMap* attributes = _input->current->getAttributes();
-    int attrCount = attributes->getLength();
-    for(int i = 0; i < attrCount; i++)
+    size_t attrCount = attributes->getLength();
+    for(size_t i = 0; i < attrCount; i++)
     {
 	ICE_XERCES_NS DOMNode* attribute = attributes->item(i);
 	string name = toString(attribute->getNodeName());