diff options
| author | Bernard Normier <bernard@zeroc.com> | 2016-11-05 10:51:56 -0400 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2016-11-05 10:51:56 -0400 |
| commit | a9207c4a7e8190cb64286afc1b373f16010d0feb (patch) | |
| tree | b6815a6debc9b9589145cc12f192b6dd83b3f49e /cpp/src/Ice/RouterInfo.cpp | |
| parent | Revert "Reverted previous double-underscore changes in IceUtil classes" (diff) | |
| download | ice-a9207c4a7e8190cb64286afc1b373f16010d0feb.tar.bz2 ice-a9207c4a7e8190cb64286afc1b373f16010d0feb.tar.xz ice-a9207c4a7e8190cb64286afc1b373f16010d0feb.zip | |
Revert "Replaced double and triple underscores in C++ by ice-prefixed names"
This reverts commit 91fa99c34d1211d426b24bf68001fc27a87b3f00.
Diffstat (limited to 'cpp/src/Ice/RouterInfo.cpp')
| -rw-r--r-- | cpp/src/Ice/RouterInfo.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cpp/src/Ice/RouterInfo.cpp b/cpp/src/Ice/RouterInfo.cpp index 3817b58d919..b205b057d7a 100644 --- a/cpp/src/Ice/RouterInfo.cpp +++ b/cpp/src/Ice/RouterInfo.cpp @@ -335,7 +335,7 @@ IceInternal::RouterInfo::setClientEndpoints(const Ice::ObjectPrxPtr& proxy) // // If getClientProxy() return nil, use router endpoints. // - _clientEndpoints = _router->iceReference()->getEndpoints(); + _clientEndpoints = _router->__reference()->getEndpoints(); } else { @@ -351,7 +351,7 @@ IceInternal::RouterInfo::setClientEndpoints(const Ice::ObjectPrxPtr& proxy) clientProxy = clientProxy->ice_timeout(_router->ice_getConnection()->timeout()); } - _clientEndpoints = clientProxy->iceReference()->getEndpoints(); + _clientEndpoints = clientProxy->__reference()->getEndpoints(); } } return _clientEndpoints; @@ -372,7 +372,7 @@ IceInternal::RouterInfo::setServerEndpoints(const Ice::ObjectPrxPtr& /*serverPro serverProxy = serverProxy->ice_router(0); // The server proxy cannot be routed. - _serverEndpoints = serverProxy->iceReference()->getEndpoints(); + _serverEndpoints = serverProxy->__reference()->getEndpoints(); } return _serverEndpoints; } |