diff options
Diffstat (limited to 'cpp/src')
-rwxr-xr-x | cpp/src/Ice/BasicStream.cpp | 2 | ||||
-rw-r--r-- | cpp/src/Ice/IncomingAsync.cpp | 2 | ||||
-rw-r--r-- | cpp/src/Ice/Object.cpp | 4 | ||||
-rw-r--r-- | cpp/src/IceStorm/Scanner.l | 5 |
4 files changed, 9 insertions, 4 deletions
diff --git a/cpp/src/Ice/BasicStream.cpp b/cpp/src/Ice/BasicStream.cpp index ce7c37fa025..199ef69d639 100755 --- a/cpp/src/Ice/BasicStream.cpp +++ b/cpp/src/Ice/BasicStream.cpp @@ -1738,7 +1738,7 @@ IceInternal::BasicStream::initReadEncaps() if(!_currentReadEncaps) // Lazy initialization. { _currentReadEncaps = &_preAllocatedReadEncaps; - _currentReadEncaps->sz = b.size(); + _currentReadEncaps->sz = static_cast<Ice::Int>(b.size()); } if(!_currentReadEncaps->decoder) // Lazy initialization. diff --git a/cpp/src/Ice/IncomingAsync.cpp b/cpp/src/Ice/IncomingAsync.cpp index b6997321a7f..f498c323bd6 100644 --- a/cpp/src/Ice/IncomingAsync.cpp +++ b/cpp/src/Ice/IncomingAsync.cpp @@ -307,7 +307,7 @@ IceAsync::Ice::AMD_Object_ice_invoke::ice_response(bool ok, const vector<Byte>& } else { - __writeParamEncaps(&outEncaps[0], outEncaps.size(), ok); + __writeParamEncaps(&outEncaps[0], static_cast<::Ice::Int>(outEncaps.size()), ok); } } catch(const LocalException& ex) diff --git a/cpp/src/Ice/Object.cpp b/cpp/src/Ice/Object.cpp index 39ad9df18c2..a8686c343bf 100644 --- a/cpp/src/Ice/Object.cpp +++ b/cpp/src/Ice/Object.cpp @@ -318,7 +318,7 @@ Ice::Blobject::__dispatch(Incoming& in, const Current& current) } else { - in.__writeParamEncaps(&outEncaps[0], outEncaps.size(), ok); + in.__writeParamEncaps(&outEncaps[0], static_cast<Ice::Int>(outEncaps.size()), ok); } if(ok) { @@ -345,7 +345,7 @@ Ice::BlobjectArray::__dispatch(Incoming& in, const Current& current) } else { - in.__writeParamEncaps(&outEncaps[0], outEncaps.size(), ok); + in.__writeParamEncaps(&outEncaps[0], static_cast<Ice::Int>(outEncaps.size()), ok); } if(ok) { diff --git a/cpp/src/IceStorm/Scanner.l b/cpp/src/IceStorm/Scanner.l index 0df69a9f1fb..cf5dc115a52 100644 --- a/cpp/src/IceStorm/Scanner.l +++ b/cpp/src/IceStorm/Scanner.l @@ -15,6 +15,11 @@ #if defined(_MSC_VER) && defined(ICE_64) // +// '=' : conversion from 'size_t' to 'int', possible loss of data +// The result of fread() is a size_t and gets inserted into an int +// +# pragma warning( 4 : 4267 ) +// // 'initializing' : conversion from '__int64' to 'int', possible loss of data // Puts a pointer-difference into an int // |