From f561241d76b7a3d58a8652a8ae6642361f6d596b Mon Sep 17 00:00:00 2001 From: Benoit Foucher Date: Tue, 15 Jan 2013 18:46:12 +0100 Subject: Fixed ICE-5131 - parsing of -p for proxies, tweaked UDP endpoint deprecation warning for -v/-e --- cpp/src/Ice/OutgoingAsync.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'cpp/src/Ice/OutgoingAsync.cpp') 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); -- cgit v1.2.3