diff options
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/Ice/OutgoingAsync.cpp | 17 | ||||
| -rw-r--r-- | cpp/src/Ice/Proxy.cpp | 117 |
2 files changed, 0 insertions, 134 deletions
diff --git a/cpp/src/Ice/OutgoingAsync.cpp b/cpp/src/Ice/OutgoingAsync.cpp index c03cdd5a441..f0cabc87b3c 100644 --- a/cpp/src/Ice/OutgoingAsync.cpp +++ b/cpp/src/Ice/OutgoingAsync.cpp @@ -1475,20 +1475,3 @@ IceInternal::CallbackBase::checkCallback(bool obj, bool cb) throw IceUtil::IllegalArgumentException(__FILE__, __LINE__, "callback cannot be null"); } } - -void -Ice::AMICallbackBase::__exception(const ::Ice::Exception& ex) -{ - ice_exception(ex); -} - -void -Ice::AMICallbackBase::__sent(bool sentSynchronously) -{ - if(!sentSynchronously) - { - dynamic_cast<AMISentCallback*>(this)->ice_sent(); - } -} - - diff --git a/cpp/src/Ice/Proxy.cpp b/cpp/src/Ice/Proxy.cpp index 87baa329e8d..96721bea8f7 100644 --- a/cpp/src/Ice/Proxy.cpp +++ b/cpp/src/Ice/Proxy.cpp @@ -744,56 +744,6 @@ IceProxy::Ice::Object::ice_invoke(const string& operation, return ice_invoke(operation, mode, inPair, outEncaps, context); } - -bool -IceProxy::Ice::Object::ice_invoke_async(const AMI_Object_ice_invokePtr& cb, - const string& operation, - OperationMode mode, - const vector<Byte>& inEncaps) -{ - Callback_Object_ice_invokePtr del; - if(dynamic_cast< ::Ice::AMISentCallback*>(cb.get())) - { - del = newCallback_Object_ice_invoke(cb, - &AMI_Object_ice_invoke::__response, - &AMI_Object_ice_invoke::__exception, - &AMI_Object_ice_invoke::__sent); - } - else - { - del = newCallback_Object_ice_invoke(cb, - &AMI_Object_ice_invoke::__response, - &AMI_Object_ice_invoke::__exception); - } - ::Ice::AsyncResultPtr result = begin_ice_invoke(operation, mode, inEncaps, del); - return result->sentSynchronously(); -} - -bool -IceProxy::Ice::Object::ice_invoke_async(const AMI_Object_ice_invokePtr& cb, - const string& operation, - OperationMode mode, - const vector<Byte>& inEncaps, - const Context& context) -{ - Callback_Object_ice_invokePtr del; - if(dynamic_cast< ::Ice::AMISentCallback*>(cb.get())) - { - del = newCallback_Object_ice_invoke(cb, - &AMI_Object_ice_invoke::__response, - &AMI_Object_ice_invoke::__exception, - &AMI_Object_ice_invoke::__sent); - } - else - { - del = newCallback_Object_ice_invoke(cb, - &AMI_Object_ice_invoke::__response, - &AMI_Object_ice_invoke::__exception); - } - ::Ice::AsyncResultPtr result = begin_ice_invoke(operation, mode, inEncaps, context, del); - return result->sentSynchronously(); -} - AsyncResultPtr IceProxy::Ice::Object::begin_ice_invoke(const string& operation, OperationMode mode, @@ -857,55 +807,6 @@ IceProxy::Ice::Object::ice_invoke(const string& operation, return ok; } -bool -IceProxy::Ice::Object::ice_invoke_async(const AMI_Array_Object_ice_invokePtr& cb, - const string& operation, - OperationMode mode, - const pair<const Byte*, const Byte*>& inEncaps) -{ - Callback_Object_ice_invokePtr del; - if(dynamic_cast< ::Ice::AMISentCallback*>(cb.get())) - { - del = newCallback_Object_ice_invoke(cb, - &AMI_Array_Object_ice_invoke::__response, - &AMI_Array_Object_ice_invoke::__exception, - &AMI_Array_Object_ice_invoke::__sent); - } - else - { - del = newCallback_Object_ice_invoke(cb, - &AMI_Array_Object_ice_invoke::__response, - &AMI_Array_Object_ice_invoke::__exception); - } - ::Ice::AsyncResultPtr result = begin_ice_invoke(operation, mode, inEncaps, del); - return result->sentSynchronously(); -} - -bool -IceProxy::Ice::Object::ice_invoke_async(const AMI_Array_Object_ice_invokePtr& cb, - const string& operation, - OperationMode mode, - const pair<const Byte*, const Byte*>& inEncaps, - const Context& context) -{ - Callback_Object_ice_invokePtr del; - if(dynamic_cast< ::Ice::AMISentCallback*>(cb.get())) - { - del = newCallback_Object_ice_invoke(cb, - &AMI_Array_Object_ice_invoke::__response, - &AMI_Array_Object_ice_invoke::__exception, - &AMI_Array_Object_ice_invoke::__sent); - } - else - { - del = newCallback_Object_ice_invoke(cb, - &AMI_Array_Object_ice_invoke::__response, - &AMI_Array_Object_ice_invoke::__exception); - } - ::Ice::AsyncResultPtr result = begin_ice_invoke(operation, mode, inEncaps, context, del); - return result->sentSynchronously(); -} - AsyncResultPtr IceProxy::Ice::Object::begin_ice_invoke(const string& operation, OperationMode mode, @@ -1538,24 +1439,6 @@ IceProxy::Ice::Object::ice_flushBatchRequests() __og.invoke(); } -bool -IceProxy::Ice::Object::ice_flushBatchRequests_async(const AMI_Object_ice_flushBatchRequestsPtr& cb) -{ - Callback_Object_ice_flushBatchRequestsPtr __del; - if(dynamic_cast< AMISentCallback*>(cb.get())) - { - __del = newCallback_Object_ice_flushBatchRequests(cb, - &AMI_Object_ice_flushBatchRequests::__exception, - &AMI_Object_ice_flushBatchRequests::__sent); - } - else - { - __del = newCallback_Object_ice_flushBatchRequests(cb, &AMI_Object_ice_flushBatchRequests::__exception); - } - ::Ice::AsyncResultPtr result = begin_ice_flushBatchRequestsInternal(__del, 0); - return result->sentSynchronously(); -} - ::Ice::AsyncResultPtr IceProxy::Ice::Object::begin_ice_flushBatchRequestsInternal(const ::IceInternal::CallbackBasePtr& del, const ::Ice::LocalObjectPtr& cookie) |