diff options
author | Benoit Foucher <benoit@zeroc.com> | 2012-03-05 15:20:12 +0100 |
---|---|---|
committer | Benoit Foucher <benoit@zeroc.com> | 2012-03-05 15:20:12 +0100 |
commit | 279cc589ece5abaeb735974e799c809227e0aa83 (patch) | |
tree | 186204caab0ce3d9cf39a5f09736e6b750e95b67 /cpp/src/Ice/Proxy.cpp | |
parent | Fixed copy/paste error for reading replica cert CN property (diff) | |
download | ice-279cc589ece5abaeb735974e799c809227e0aa83.tar.bz2 ice-279cc589ece5abaeb735974e799c809227e0aa83.tar.xz ice-279cc589ece5abaeb735974e799c809227e0aa83.zip |
ICE-4793 - Fixes to prevent GCC shadow warnings and other minor fixes
Diffstat (limited to 'cpp/src/Ice/Proxy.cpp')
-rw-r--r-- | cpp/src/Ice/Proxy.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
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) { |