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/CommunicatorI.cpp | |
| 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/CommunicatorI.cpp')
| -rw-r--r-- | cpp/src/Ice/CommunicatorI.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/cpp/src/Ice/CommunicatorI.cpp b/cpp/src/Ice/CommunicatorI.cpp index a7c2aee35d2..9a48b60d55b 100644 --- a/cpp/src/Ice/CommunicatorI.cpp +++ b/cpp/src/Ice/CommunicatorI.cpp @@ -221,11 +221,11 @@ Ice::CommunicatorI::begin_flushBatchRequests(const Callback_Communicator_flushBa return __begin_flushBatchRequests(cb, cookie); } -#ifdef ICE_CPP11 AsyncResultPtr Ice::CommunicatorI::begin_flushBatchRequests(const IceInternal::Function<void (const Exception&)>& exception, const IceInternal::Function<void (bool)>& sent) { +#ifdef ICE_CPP11 class Cpp11CB : public IceInternal::Cpp11FnCallbackNC { @@ -256,8 +256,11 @@ Ice::CommunicatorI::begin_flushBatchRequests(const IceInternal::Function<void (c }; return __begin_flushBatchRequests(new Cpp11CB(exception, sent), 0); -} +#else + assert(false); // Ice not built with C++11 support. + return 0; #endif +} namespace { |