diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2012-08-08 15:49:02 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2012-08-08 15:49:02 +0200 |
| commit | 5bee6b7dd838a7b8b84a1b41251579a05e6aa8ec (patch) | |
| tree | 71f7dd2a1096dab81bd8ddb4e17d5ac42f38c65d /cpp/src/Ice/BasicStream.cpp | |
| parent | Fixes (diff) | |
| parent | Fixed python & ruby compilation error caused by OutputStream::format removal (diff) | |
| download | ice-5bee6b7dd838a7b8b84a1b41251579a05e6aa8ec.tar.bz2 ice-5bee6b7dd838a7b8b84a1b41251579a05e6aa8ec.tar.xz ice-5bee6b7dd838a7b8b84a1b41251579a05e6aa8ec.zip | |
Merge remote-tracking branch 'origin/encoding11' into mx
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. |