summaryrefslogtreecommitdiff
path: root/cpp/src/Ice/RequestHandlerFactory.cpp
diff options
context:
space:
mode:
authorBernard Normier <bernard@zeroc.com>2016-11-05 10:51:56 -0400
committerBernard Normier <bernard@zeroc.com>2016-11-05 10:51:56 -0400
commita9207c4a7e8190cb64286afc1b373f16010d0feb (patch)
treeb6815a6debc9b9589145cc12f192b6dd83b3f49e /cpp/src/Ice/RequestHandlerFactory.cpp
parentRevert "Reverted previous double-underscore changes in IceUtil classes" (diff)
downloadice-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/RequestHandlerFactory.cpp')
-rw-r--r--cpp/src/Ice/RequestHandlerFactory.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/cpp/src/Ice/RequestHandlerFactory.cpp b/cpp/src/Ice/RequestHandlerFactory.cpp
index 6d5dc493e7a..414d1001220 100644
--- a/cpp/src/Ice/RequestHandlerFactory.cpp
+++ b/cpp/src/Ice/RequestHandlerFactory.cpp
@@ -30,7 +30,7 @@ IceInternal::RequestHandlerFactory::getRequestHandler(const RoutableReferencePtr
Ice::ObjectAdapterPtr adapter = _instance->objectAdapterFactory()->findObjectAdapter(proxy);
if(adapter)
{
- return proxy->iceSetRequestHandler(ICE_MAKE_SHARED(CollocatedRequestHandler, ref, adapter));
+ return proxy->__setRequestHandler(ICE_MAKE_SHARED(CollocatedRequestHandler, ref, adapter));
}
}
@@ -64,7 +64,7 @@ IceInternal::RequestHandlerFactory::getRequestHandler(const RoutableReferencePtr
ref->getConnection(handler.get());
#endif
}
- return proxy->iceSetRequestHandler(handler->connect(proxy));
+ return proxy->__setRequestHandler(handler->connect(proxy));
}
void