diff options
Diffstat (limited to 'cpp/include/Ice/CommunicatorAsync.h')
| -rw-r--r-- | cpp/include/Ice/CommunicatorAsync.h | 34 |
1 files changed, 2 insertions, 32 deletions
diff --git a/cpp/include/Ice/CommunicatorAsync.h b/cpp/include/Ice/CommunicatorAsync.h index a47ff1282d7..5258a2e1a55 100644 --- a/cpp/include/Ice/CommunicatorAsync.h +++ b/cpp/include/Ice/CommunicatorAsync.h @@ -40,43 +40,13 @@ public: __com->end_flushBatchRequests(__result); assert(false); } - catch(::Ice::Exception& ex) + catch(const ::Ice::Exception& ex) { ::IceInternal::CallbackNC<T>::__exception(__result, ex); } } }; -#ifdef ICE_CPP11 -class Cpp11FnCallbackNC_Communicator_flushBatchRequests : virtual public ::IceInternal::Cpp11FnCallbackNC -{ -public: - - Cpp11FnCallbackNC_Communicator_flushBatchRequests( - const ::IceInternal::Function<void (const ::Ice::Exception&)>& excb, - const ::IceInternal::Function<void (bool)>& sentcb) : - ::IceInternal::Cpp11FnCallbackNC(excb, sentcb) - { - CallbackBase::checkCallback(true, excb != nullptr); - } - - virtual void - __completed(const ::Ice::AsyncResultPtr& __result) const - { - ::Ice::CommunicatorPtr __com = __result->getCommunicator(); - assert(__com); - try - { - __com->end_flushBatchRequests(__result); - assert(false); - } - catch(::Ice::Exception& ex) - { - ::IceInternal::Cpp11FnCallbackNC::__exception(__result, ex); - } - } -}; -#endif template<class T> Callback_Communicator_flushBatchRequestsPtr newCallback_Communicator_flushBatchRequests(const IceUtil::Handle<T>& instance, @@ -118,7 +88,7 @@ public: __com->end_flushBatchRequests(__result); assert(false); } - catch(::Ice::Exception& ex) + catch(const ::Ice::Exception& ex) { ::IceInternal::Callback<T, CT>::__exception(__result, ex); } |