diff options
Diffstat (limited to 'cpp/src/Ice/BatchRequestQueue.cpp')
| -rw-r--r-- | cpp/src/Ice/BatchRequestQueue.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/cpp/src/Ice/BatchRequestQueue.cpp b/cpp/src/Ice/BatchRequestQueue.cpp index c34de544df7..04bee6e06d5 100644 --- a/cpp/src/Ice/BatchRequestQueue.cpp +++ b/cpp/src/Ice/BatchRequestQueue.cpp @@ -25,7 +25,7 @@ class BatchRequestI : public Ice::BatchRequest { public: - BatchRequestI(BatchRequestQueue& queue, const Ice::ObjectPrx& proxy, const string& operation, int size) : + BatchRequestI(BatchRequestQueue& queue, const Ice::ObjectPrxPtr& proxy, const string& operation, int size) : _queue(queue), _proxy(proxy), _operation(operation), _size(size) { } @@ -48,7 +48,7 @@ public: return _operation; } - virtual const Ice::ObjectPrx& + virtual const Ice::ObjectPrxPtr& getProxy() const { return _proxy; @@ -57,7 +57,7 @@ public: private: BatchRequestQueue& _queue; - const Ice::ObjectPrx& _proxy; + const Ice::ObjectPrxPtr& _proxy; const std::string& _operation; const int _size; }; @@ -101,7 +101,7 @@ BatchRequestQueue::prepareBatchRequest(BasicStream* os) } void -BatchRequestQueue::finishBatchRequest(BasicStream* os, const Ice::ObjectPrx& proxy, const std::string& operation) +BatchRequestQueue::finishBatchRequest(BasicStream* os, const Ice::ObjectPrxPtr& proxy, const std::string& operation) { // // No need for synchronization, no other threads are supposed @@ -116,7 +116,11 @@ BatchRequestQueue::finishBatchRequest(BasicStream* os, const Ice::ObjectPrx& pro if(_maxSize > 0 && _batchStream.b.size() >= _maxSize) { +#ifdef ICE_CPP11_MAPPING + proxy->ice_flushBatchRequests_async(); +#else proxy->begin_ice_flushBatchRequests(); +#endif } assert(_batchMarker < _batchStream.b.size()); |