diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2012-04-18 14:33:16 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2012-04-18 14:33:16 +0200 |
| commit | 2ba4d4e0ca7aeade69ee00ab17d5fa1b69372ffc (patch) | |
| tree | 0a381f9b284eb7ca5acc9bca5a97659d19874f9d /cpp/src/Ice/OutgoingAsync.cpp | |
| parent | ICE-4828 - Buffer.h undeclared ptrdiff_t issue on OpenSUSE (diff) | |
| download | ice-2ba4d4e0ca7aeade69ee00ab17d5fa1b69372ffc.tar.bz2 ice-2ba4d4e0ca7aeade69ee00ab17d5fa1b69372ffc.tar.xz ice-2ba4d4e0ca7aeade69ee00ab17d5fa1b69372ffc.zip | |
Added support for encoding versioning
Diffstat (limited to 'cpp/src/Ice/OutgoingAsync.cpp')
| -rw-r--r-- | cpp/src/Ice/OutgoingAsync.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/cpp/src/Ice/OutgoingAsync.cpp b/cpp/src/Ice/OutgoingAsync.cpp index 9ba45c8a719..0c518566cab 100644 --- a/cpp/src/Ice/OutgoingAsync.cpp +++ b/cpp/src/Ice/OutgoingAsync.cpp @@ -102,8 +102,8 @@ Ice::AsyncResult::AsyncResult(const CommunicatorPtr& communicator, _operation(op), _callback(del), _cookie(cookie), - _is(instance.get()), - _os(instance.get()), + _is(instance.get(), Ice::currentProtocolEncoding), + _os(instance.get(), Ice::currentProtocolEncoding), _state(0), _sentSynchronously(false), _exception(0) @@ -411,7 +411,8 @@ IceInternal::OutgoingAsync::OutgoingAsync(const ObjectPrx& prx, const CallbackBasePtr& delegate, const Ice::LocalObjectPtr& cookie) : AsyncResult(prx->ice_getCommunicator(), prx->__reference()->getInstance(), operation, delegate, cookie), - _proxy(prx) + _proxy(prx), + _encoding(prx->__reference()->getEncoding()) { } @@ -477,8 +478,6 @@ IceInternal::OutgoingAsync::__prepare(const std::string& operation, OperationMod implicitContext->write(prxContext, &_os); } } - - _os.startWriteEncaps(); } bool |