diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2015-03-10 12:12:10 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2015-03-10 12:12:10 +0100 |
| commit | c6ca68d97aa5bbc2a172e3e35171b5452657fa22 (patch) | |
| tree | 46edcca4c8e313285a205bf6fad7c56c452c0cc0 /cpp/src/Ice/ObjectAdapterI.h | |
| parent | Minor JS style fixes (diff) | |
| download | ice-c6ca68d97aa5bbc2a172e3e35171b5452657fa22.tar.bz2 ice-c6ca68d97aa5bbc2a172e3e35171b5452657fa22.tar.xz ice-c6ca68d97aa5bbc2a172e3e35171b5452657fa22.zip | |
ICE-6170 - fixed behavior of batch requests
Diffstat (limited to 'cpp/src/Ice/ObjectAdapterI.h')
| -rw-r--r-- | cpp/src/Ice/ObjectAdapterI.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cpp/src/Ice/ObjectAdapterI.h b/cpp/src/Ice/ObjectAdapterI.h index a0082608ad7..6ae147d9907 100644 --- a/cpp/src/Ice/ObjectAdapterI.h +++ b/cpp/src/Ice/ObjectAdapterI.h @@ -84,10 +84,10 @@ public: virtual EndpointSeq getEndpoints() const; virtual EndpointSeq getPublishedEndpoints() const; - + bool isLocal(const ObjectPrx&) const; - void flushAsyncBatchRequests(const IceInternal::CommunicatorFlushBatchPtr&); + void flushAsyncBatchRequests(const IceInternal::CommunicatorFlushBatchAsyncPtr&); void updateConnectionObservers(); void updateThreadObservers(); @@ -102,12 +102,12 @@ public: private: - ObjectAdapterI(const IceInternal::InstancePtr&, const CommunicatorPtr&, + ObjectAdapterI(const IceInternal::InstancePtr&, const CommunicatorPtr&, const IceInternal::ObjectAdapterFactoryPtr&, const std::string&, bool); virtual ~ObjectAdapterI(); void initialize(const RouterPrx&); friend class IceInternal::ObjectAdapterFactory; - + ObjectPrx newProxy(const Identity&, const std::string&) const; ObjectPrx newDirectProxy(const Identity&, const std::string&) const; ObjectPrx newIndirectProxy(const Identity&, const std::string&, const std::string&) const; |