diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2013-01-15 18:46:12 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2013-01-15 18:46:12 +0100 |
| commit | f561241d76b7a3d58a8652a8ae6642361f6d596b (patch) | |
| tree | 06602625807c74e6476043eee42f304e15609592 /cpp/src/Ice/OutgoingAsync.cpp | |
| parent | Fixed(ICE-5184) -IceGridGUI will not allow me to enter port in connection cre... (diff) | |
| download | ice-f561241d76b7a3d58a8652a8ae6642361f6d596b.tar.bz2 ice-f561241d76b7a3d58a8652a8ae6642361f6d596b.tar.xz ice-f561241d76b7a3d58a8652a8ae6642361f6d596b.zip | |
Fixed ICE-5131 - parsing of -p <version> for proxies, tweaked UDP endpoint deprecation warning for -v/-e
Diffstat (limited to 'cpp/src/Ice/OutgoingAsync.cpp')
| -rw-r--r-- | cpp/src/Ice/OutgoingAsync.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cpp/src/Ice/OutgoingAsync.cpp b/cpp/src/Ice/OutgoingAsync.cpp index 04e9eabdc02..9d15133ad8a 100644 --- a/cpp/src/Ice/OutgoingAsync.cpp +++ b/cpp/src/Ice/OutgoingAsync.cpp @@ -426,7 +426,7 @@ IceInternal::OutgoingAsync::OutgoingAsync(const ObjectPrx& prx, const Ice::LocalObjectPtr& cookie) : AsyncResult(prx->ice_getCommunicator(), prx->__reference()->getInstance(), operation, delegate, cookie), _proxy(prx), - _encoding(checkForCompatibleEncoding(prx->__reference()->getEncoding())) + _encoding(getCompatibleEncoding(prx->__reference()->getEncoding())) { } @@ -438,7 +438,7 @@ IceInternal::OutgoingAsync::__prepare(const std::string& operation, OperationMod _mode = mode; _sentSynchronously = false; - checkSupportedProtocol(_proxy->__reference()->getProtocol()); + checkSupportedProtocol(getCompatibleProtocol(_proxy->__reference()->getProtocol())); _observer.attach(_proxy.get(), operation, context); |