diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2014-10-28 15:02:03 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2014-10-28 15:02:03 +0100 |
| commit | c8bd13216c537a811dc6b770b2d6631ed230ee2c (patch) | |
| tree | 74d96ecfff05197bbe8df59335e6f276745e7641 /cpp/src/Ice/ConnectionI.h | |
| parent | ICE-5792 fixed IceGridGUI install (diff) | |
| download | ice-c8bd13216c537a811dc6b770b2d6631ed230ee2c.tar.bz2 ice-c8bd13216c537a811dc6b770b2d6631ed230ee2c.tar.xz ice-c8bd13216c537a811dc6b770b2d6631ed230ee2c.zip | |
Fixed ICE-5548: fixed C++11 support to maintain binary compatibility between C++11 and C++03 compiled code
Diffstat (limited to 'cpp/src/Ice/ConnectionI.h')
| -rw-r--r-- | cpp/src/Ice/ConnectionI.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/cpp/src/Ice/ConnectionI.h b/cpp/src/Ice/ConnectionI.h index 6ed4618eed7..0542741e49b 100644 --- a/cpp/src/Ice/ConnectionI.h +++ b/cpp/src/Ice/ConnectionI.h @@ -171,11 +171,10 @@ public: virtual AsyncResultPtr begin_flushBatchRequests(const CallbackPtr&, const LocalObjectPtr& = 0); virtual AsyncResultPtr begin_flushBatchRequests(const Callback_Connection_flushBatchRequestsPtr&, 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&); |