diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2014-07-01 17:42:04 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2014-07-01 17:42:04 +0200 |
| commit | 344a7fd6e0d716f81dc27495e97a7ad9c2ab07b8 (patch) | |
| tree | bd06f4919e5a5827f60e2a536e43e47a4fbed6d2 /cpp/include/Ice/ObserverHelper.h | |
| parent | Fixed ICE-5569: IceStorm IceMX debug iterator assert (diff) | |
| download | ice-344a7fd6e0d716f81dc27495e97a7ad9c2ab07b8.tar.bz2 ice-344a7fd6e0d716f81dc27495e97a7ad9c2ab07b8.tar.xz ice-344a7fd6e0d716f81dc27495e97a7ad9c2ab07b8.zip | |
IceMX and Python support for the new collocation optimization
Diffstat (limited to 'cpp/include/Ice/ObserverHelper.h')
| -rw-r--r-- | cpp/include/Ice/ObserverHelper.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cpp/include/Ice/ObserverHelper.h b/cpp/include/Ice/ObserverHelper.h index b3436dae027..614226b8c09 100644 --- a/cpp/include/Ice/ObserverHelper.h +++ b/cpp/include/Ice/ObserverHelper.h @@ -138,7 +138,7 @@ public: } } - ::Ice::Instrumentation::RemoteObserverPtr + ::Ice::Instrumentation::ChildInvocationObserverPtr getRemoteObserver(const Ice::ConnectionInfoPtr& con, const Ice::EndpointPtr& endpt, int requestId, int size) { if(_observer) @@ -148,12 +148,12 @@ public: return 0; } - ::Ice::Instrumentation::RemoteObserverPtr - getCollocatedObserver(int requestId, int size) + ::Ice::Instrumentation::ChildInvocationObserverPtr + getCollocatedObserver(const Ice::ObjectAdapterPtr& adapter, int requestId, int size) { if(_observer) { - return _observer->getCollocatedObserver(requestId, size); + return _observer->getCollocatedObserver(adapter, requestId, size); } return 0; } |