diff options
author | Bernard Normier <bernard@zeroc.com> | 2012-08-07 15:40:53 -0400 |
---|---|---|
committer | Bernard Normier <bernard@zeroc.com> | 2012-08-07 15:40:53 -0400 |
commit | 987b12acd6ecad876d81ae251ff56042247acbc0 (patch) | |
tree | be7d76b5356507eb137a10a9ec1abfc6741142e5 /cpp/src/Ice/BasicStream.cpp | |
parent | fixing slice2java bugs (diff) | |
download | ice-987b12acd6ecad876d81ae251ff56042247acbc0.tar.bz2 ice-987b12acd6ecad876d81ae251ff56042247acbc0.tar.xz ice-987b12acd6ecad876d81ae251ff56042247acbc0.zip |
VS2012 build fixes
Diffstat (limited to 'cpp/src/Ice/BasicStream.cpp')
-rwxr-xr-x | cpp/src/Ice/BasicStream.cpp | 2 |
1 files changed, 1 insertions, 1 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. |