From 279cc589ece5abaeb735974e799c809227e0aa83 Mon Sep 17 00:00:00 2001 From: Benoit Foucher Date: Mon, 5 Mar 2012 15:20:12 +0100 Subject: ICE-4793 - Fixes to prevent GCC shadow warnings and other minor fixes --- cpp/src/Ice/Proxy.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'cpp/src/Ice/Proxy.cpp') diff --git a/cpp/src/Ice/Proxy.cpp b/cpp/src/Ice/Proxy.cpp index cd4bd599a35..8bddf2d9f60 100644 --- a/cpp/src/Ice/Proxy.cpp +++ b/cpp/src/Ice/Proxy.cpp @@ -1708,7 +1708,7 @@ IceDelegateD::Ice::Object::ice_isA(const string& __id, const Context* context) try { - __direct.servant()->__collocDispatch(__direct); + __direct.getServant()->__collocDispatch(__direct); } catch(const ::std::exception& __ex) { @@ -1766,7 +1766,7 @@ IceDelegateD::Ice::Object::ice_ping(const ::Ice::Context* context) try { - __direct.servant()->__collocDispatch(__direct); + __direct.getServant()->__collocDispatch(__direct); } catch(const ::std::exception& __ex) { @@ -1829,7 +1829,7 @@ IceDelegateD::Ice::Object::ice_ids(const ::Ice::Context* context) try { - __direct.servant()->__collocDispatch(__direct); + __direct.getServant()->__collocDispatch(__direct); } catch(const ::std::exception& __ex) { @@ -1893,7 +1893,7 @@ IceDelegateD::Ice::Object::ice_id(const ::Ice::Context* context) try { - __direct.servant()->__collocDispatch(__direct); + __direct.getServant()->__collocDispatch(__direct); } catch(const ::std::exception& __ex) { -- cgit v1.2.3