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/ObserverHelper.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/ObserverHelper.cpp')
| -rw-r--r-- | cpp/src/Ice/ObserverHelper.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cpp/src/Ice/ObserverHelper.cpp b/cpp/src/Ice/ObserverHelper.cpp index 3cf5b1e3da5..6b88a0d68de 100644 --- a/cpp/src/Ice/ObserverHelper.cpp +++ b/cpp/src/Ice/ObserverHelper.cpp @@ -18,7 +18,7 @@ using namespace Ice::Instrumentation; IceInternal::InvocationObserver::InvocationObserver(const Ice::ObjectPrxPtr& proxy, const string& op, const Context& ctx) { - const CommunicatorObserverPtr& obsv = proxy->iceReference()->getInstance()->initializationData().observer; + const CommunicatorObserverPtr& obsv = proxy->__reference()->getInstance()->initializationData().observer; if(!obsv) { return; @@ -40,7 +40,7 @@ IceInternal::InvocationObserver::InvocationObserver(IceInternal::Instance* insta void IceInternal::InvocationObserver::attach(const Ice::ObjectPrxPtr& proxy, const string& op, const Context& ctx) { - const CommunicatorObserverPtr& obsv = proxy->iceReference()->getInstance()->initializationData().observer; + const CommunicatorObserverPtr& obsv = proxy->__reference()->getInstance()->initializationData().observer; if(!obsv) { return; |