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/Outgoing.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'cpp/src/Ice/Outgoing.cpp') diff --git a/cpp/src/Ice/Outgoing.cpp b/cpp/src/Ice/Outgoing.cpp index 51f41bedd2b..acd4856aace 100644 --- a/cpp/src/Ice/Outgoing.cpp +++ b/cpp/src/Ice/Outgoing.cpp @@ -87,12 +87,12 @@ IceInternal::Outgoing::Outgoing(RequestHandler* handler, const string& operation _handler(handler), _observer(observer), _state(StateUnsent), - _encoding(checkForCompatibleEncoding(handler->getReference()->getEncoding())), + _encoding(getCompatibleEncoding(handler->getReference()->getEncoding())), _is(handler->getReference()->getInstance().get(), Ice::currentProtocolEncoding), _os(handler->getReference()->getInstance().get(), Ice::currentProtocolEncoding), _sent(false) { - checkSupportedProtocol(handler->getReference()->getProtocol()); + checkSupportedProtocol(getCompatibleProtocol(handler->getReference()->getProtocol())); switch(_handler->getReference()->getMode()) { -- cgit v1.2.3