summaryrefslogtreecommitdiff
path: root/cpp/src/Ice/Reference.cpp
diff options
context:
space:
mode:
authorBernard Normier <bernard@zeroc.com>2016-11-02 17:56:08 -0400
committerBernard Normier <bernard@zeroc.com>2016-11-02 17:56:08 -0400
commit91fa99c34d1211d426b24bf68001fc27a87b3f00 (patch)
tree15af995f00414098b678b4cff09a9f0c29830fa8 /cpp/src/Ice/Reference.cpp
parentAdd C# code sign support (diff)
downloadice-91fa99c34d1211d426b24bf68001fc27a87b3f00.tar.bz2
ice-91fa99c34d1211d426b24bf68001fc27a87b3f00.tar.xz
ice-91fa99c34d1211d426b24bf68001fc27a87b3f00.zip
Replaced double and triple underscores in C++ by ice-prefixed names
Diffstat (limited to 'cpp/src/Ice/Reference.cpp')
-rw-r--r--cpp/src/Ice/Reference.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/cpp/src/Ice/Reference.cpp b/cpp/src/Ice/Reference.cpp
index 12296b9f04f..e2c824002e1 100644
--- a/cpp/src/Ice/Reference.cpp
+++ b/cpp/src/Ice/Reference.cpp
@@ -815,7 +815,7 @@ IceInternal::FixedReference::getRequestHandler(const Ice::ObjectPrxPtr& proxy) c
}
ReferencePtr ref = const_cast<FixedReference*>(this);
- return proxy->__setRequestHandler(ICE_MAKE_SHARED(ConnectionRequestHandler, ref, _fixedConnection, compress));
+ return proxy->iceSetRequestHandler(ICE_MAKE_SHARED(ConnectionRequestHandler, ref, _fixedConnection, compress));
}
BatchRequestQueuePtr
@@ -1269,7 +1269,7 @@ IceInternal::RoutableReference::toProperty(const string& prefix) const
}
if(_routerInfo)
{
- PropertyDict routerProperties = _routerInfo->getRouter()->__reference()->toProperty(prefix + ".Router");
+ PropertyDict routerProperties = _routerInfo->getRouter()->iceReference()->toProperty(prefix + ".Router");
for(PropertyDict::const_iterator p = routerProperties.begin(); p != routerProperties.end(); ++p)
{
properties[p->first] = p->second;
@@ -1278,7 +1278,7 @@ IceInternal::RoutableReference::toProperty(const string& prefix) const
if(_locatorInfo)
{
- PropertyDict locatorProperties = _locatorInfo->getLocator()->__reference()->toProperty(prefix + ".Locator");
+ PropertyDict locatorProperties = _locatorInfo->getLocator()->iceReference()->toProperty(prefix + ".Locator");
for(PropertyDict::const_iterator p = locatorProperties.begin(); p != locatorProperties.end(); ++p)
{
properties[p->first] = p->second;