diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2013-01-07 10:40:46 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2013-01-07 10:40:46 +0100 |
| commit | 2df826d5f51275271cd1738a0d945f3e036cd1c5 (patch) | |
| tree | 5471b19e519c5c78b75031990b1744366983db76 /cpp/src/Ice/Incoming.cpp | |
| parent | Fixed ICE-4933: Added size and replySize fields to dispatch and remote invoca... (diff) | |
| download | ice-2df826d5f51275271cd1738a0d945f3e036cd1c5.tar.bz2 ice-2df826d5f51275271cd1738a0d945f3e036cd1c5.tar.xz ice-2df826d5f51275271cd1738a0d945f3e036cd1c5.zip | |
Win32 x64 build fixes
Diffstat (limited to 'cpp/src/Ice/Incoming.cpp')
| -rw-r--r-- | cpp/src/Ice/Incoming.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/cpp/src/Ice/Incoming.cpp b/cpp/src/Ice/Incoming.cpp index 699ece0d3d5..e03e909169d 100644 --- a/cpp/src/Ice/Incoming.cpp +++ b/cpp/src/Ice/Incoming.cpp @@ -230,7 +230,7 @@ IceInternal::IncomingBase::__servantLocatorFinished() _os.startWriteEncaps(_current.encoding, DefaultFormat); _os.write(ex); _os.endWriteEncaps(); - _observer.reply(_os.b.size() - headerSize - 4); + _observer.reply(static_cast<Int>(_os.b.size() - headerSize - 4)); _connection->sendResponse(&_os, _compress); } else @@ -323,7 +323,7 @@ IceInternal::IncomingBase::__handleException(const std::exception& exc) _os.write(rfe->operation, false); - _observer.reply(_os.b.size() - headerSize - 4); + _observer.reply(static_cast<Int>(_os.b.size() - headerSize - 4)); _connection->sendResponse(&_os, _compress); } else @@ -391,7 +391,7 @@ IceInternal::IncomingBase::__handleException(const std::exception& exc) _os.write(str.str(), false); } - _observer.reply(_os.b.size() - headerSize - 4); + _observer.reply(static_cast<Int>(_os.b.size() - headerSize - 4)); _connection->sendResponse(&_os, _compress); } else @@ -419,7 +419,7 @@ IceInternal::IncomingBase::__handleException(const std::exception& exc) str << "std::exception: " << exc.what(); _os.write(str.str(), false); - _observer.reply(_os.b.size() - headerSize - 4); + _observer.reply(static_cast<Int>(_os.b.size() - headerSize - 4)); _connection->sendResponse(&_os, _compress); } else @@ -453,7 +453,7 @@ IceInternal::IncomingBase::__handleException() _os.write(replyUnknownException); string reason = "unknown c++ exception"; _os.write(reason, false); - _observer.reply(_os.b.size() - headerSize - 4); + _observer.reply(static_cast<Int>(_os.b.size() - headerSize - 4)); _connection->sendResponse(&_os, _compress); } else @@ -596,7 +596,7 @@ IceInternal::Incoming::invoke(const ServantManagerPtr& servantManager, BasicStre _is->read(sz); _is->i -= 4; - _observer.attach(obsv->getDispatchObserver(_current, _is->i - start + sz)); + _observer.attach(obsv->getDispatchObserver(_current, static_cast<Int>(_is->i - start + sz))); } // @@ -634,7 +634,7 @@ IceInternal::Incoming::invoke(const ServantManagerPtr& servantManager, BasicStre _os.startWriteEncaps(encoding, DefaultFormat); _os.write(ex); _os.endWriteEncaps(); - _observer.reply(_os.b.size() - headerSize - 4); + _observer.reply(static_cast<Int>(_os.b.size() - headerSize - 4)); _connection->sendResponse(&_os, _compress); } else @@ -725,7 +725,7 @@ IceInternal::Incoming::invoke(const ServantManagerPtr& servantManager, BasicStre if(_response) { - _observer.reply(_os.b.size() - headerSize - 4); + _observer.reply(static_cast<Int>(_os.b.size() - headerSize - 4)); _connection->sendResponse(&_os, _compress); } else |