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 | |
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')
-rw-r--r-- | cpp/src/Ice/ConnectionI.cpp | 12 | ||||
-rw-r--r-- | cpp/src/Ice/Incoming.cpp | 16 | ||||
-rw-r--r-- | cpp/src/Ice/IncomingAsync.cpp | 2 | ||||
-rw-r--r-- | cpp/src/Ice/Outgoing.cpp | 2 | ||||
-rw-r--r-- | cpp/src/Ice/OutgoingAsync.cpp | 2 |
5 files changed, 19 insertions, 15 deletions
diff --git a/cpp/src/Ice/ConnectionI.cpp b/cpp/src/Ice/ConnectionI.cpp index d2ef8eadba9..1e651481a64 100644 --- a/cpp/src/Ice/ConnectionI.cpp +++ b/cpp/src/Ice/ConnectionI.cpp @@ -589,7 +589,8 @@ Ice::ConnectionI::sendRequest(Outgoing* out, bool compress, bool response) #endif } - out->attachRemoteObserver(initConnectionInfo(), _endpoint, requestId, os->b.size() - headerSize - 4); + out->attachRemoteObserver(initConnectionInfo(), _endpoint, requestId, + static_cast<Int>(os->b.size() - headerSize - 4)); // // Send the message. If it can't be sent without blocking the message is added @@ -668,7 +669,8 @@ Ice::ConnectionI::sendAsyncRequest(const OutgoingAsyncPtr& out, bool compress, b #endif } - out->__attachRemoteObserver(initConnectionInfo(), _endpoint, requestId, os->b.size() - headerSize - 4); + out->__attachRemoteObserver(initConnectionInfo(), _endpoint, requestId, + static_cast<Int>(os->b.size() - headerSize - 4)); AsyncStatus status = AsyncStatusQueued; try @@ -974,7 +976,8 @@ Ice::ConnectionI::flushBatchRequests(BatchOutgoing* out) copy(p, p + sizeof(Int), _batchStream.b.begin() + headerSize); #endif - out->attachRemoteObserver(initConnectionInfo(), _endpoint, _batchStream.b.size() - headerSize - 4); + out->attachRemoteObserver(initConnectionInfo(), _endpoint, + static_cast<Int>(_batchStream.b.size() - headerSize - 4)); _batchStream.swap(*out->os()); @@ -1039,7 +1042,8 @@ Ice::ConnectionI::flushAsyncBatchRequests(const BatchOutgoingAsyncPtr& outAsync) copy(p, p + sizeof(Int), _batchStream.b.begin() + headerSize); #endif - outAsync->__attachRemoteObserver(initConnectionInfo(), _endpoint, 0, _batchStream.b.size() - headerSize - 4); + outAsync->__attachRemoteObserver(initConnectionInfo(), _endpoint, 0, + static_cast<Int>(_batchStream.b.size() - headerSize - 4)); _batchStream.swap(*outAsync->__getOs()); 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 diff --git a/cpp/src/Ice/IncomingAsync.cpp b/cpp/src/Ice/IncomingAsync.cpp index 30fd7de967d..d2da7dd3b70 100644 --- a/cpp/src/Ice/IncomingAsync.cpp +++ b/cpp/src/Ice/IncomingAsync.cpp @@ -200,7 +200,7 @@ IceInternal::IncomingAsync::__response() if(_response) { - _observer.reply(_os.b.size() - headerSize - 4); + _observer.reply(static_cast<Int>(_os.b.size() - headerSize - 4)); _connection->sendResponse(&_os, _compress); } else diff --git a/cpp/src/Ice/Outgoing.cpp b/cpp/src/Ice/Outgoing.cpp index 118dc25612c..4f75c9957e1 100644 --- a/cpp/src/Ice/Outgoing.cpp +++ b/cpp/src/Ice/Outgoing.cpp @@ -381,7 +381,7 @@ IceInternal::Outgoing::finished(BasicStream& is) assert(_state <= StateInProgress); if(_remoteObserver) { - _remoteObserver->reply(is.b.size() - headerSize - 4); + _remoteObserver->reply(static_cast<Int>(is.b.size() - headerSize - 4)); } _remoteObserver.detach(); diff --git a/cpp/src/Ice/OutgoingAsync.cpp b/cpp/src/Ice/OutgoingAsync.cpp index 890e33a4cb9..6f68cb9b6f2 100644 --- a/cpp/src/Ice/OutgoingAsync.cpp +++ b/cpp/src/Ice/OutgoingAsync.cpp @@ -619,7 +619,7 @@ IceInternal::OutgoingAsync::__finished(BasicStream& is) assert(!_exception.get() && !(_state & Done)); if(_remoteObserver) { - _remoteObserver->reply(is.b.size() - headerSize - 4); + _remoteObserver->reply(static_cast<Int>(is.b.size() - headerSize - 4)); } _remoteObserver.detach(); |