diff options
| author | Bernard Normier <bernard@zeroc.com> | 2014-07-24 16:06:51 +0000 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2014-07-24 16:06:51 +0000 |
| commit | ac23953bb2f5ab0bac337f15d4d8739e7aa1ce5c (patch) | |
| tree | 3af419df5b8c46c809d579fdcd7165135f452d8f /cpp/src/Ice/ConnectionI.h | |
| parent | VS 2010 build fix (diff) | |
| download | ice-ac23953bb2f5ab0bac337f15d4d8739e7aa1ce5c.tar.bz2 ice-ac23953bb2f5ab0bac337f15d4d8739e7aa1ce5c.tar.xz ice-ac23953bb2f5ab0bac337f15d4d8739e7aa1ce5c.zip | |
Completed fix for ICE-5567: move various C++11 classes/functions out of line
Diffstat (limited to 'cpp/src/Ice/ConnectionI.h')
| -rw-r--r-- | cpp/src/Ice/ConnectionI.h | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/cpp/src/Ice/ConnectionI.h b/cpp/src/Ice/ConnectionI.h index 36200d0aa4d..b7254df51ba 100644 --- a/cpp/src/Ice/ConnectionI.h +++ b/cpp/src/Ice/ConnectionI.h @@ -166,19 +166,16 @@ public: virtual void flushBatchRequests(); // From Connection. -#ifdef ICE_CPP11 - virtual ::Ice::AsyncResultPtr begin_flushBatchRequests( - const ::IceInternal::Function<void (const ::Ice::Exception&)>& exception, - const ::IceInternal::Function<void (bool)>& sent = ::IceInternal::Function<void (bool)>()) - { - return __begin_flushBatchRequests(new Cpp11FnCallbackNC_Connection_flushBatchRequests(exception, sent), 0); - } -#endif - virtual AsyncResultPtr begin_flushBatchRequests(); virtual AsyncResultPtr begin_flushBatchRequests(const CallbackPtr&, const LocalObjectPtr& = 0); virtual AsyncResultPtr begin_flushBatchRequests(const Callback_Connection_flushBatchRequestsPtr&, - const LocalObjectPtr& = 0); + const LocalObjectPtr& = 0); +#ifdef ICE_CPP11 + virtual AsyncResultPtr begin_flushBatchRequests( + const ::IceInternal::Function<void (const ::Ice::Exception&)>&, + const ::IceInternal::Function<void (bool)>& = ::IceInternal::Function<void (bool)>()); +#endif + virtual void end_flushBatchRequests(const AsyncResultPtr&); bool flushBatchRequests(IceInternal::BatchOutgoing*); |