summaryrefslogtreecommitdiff
path: root/cpp
diff options
context:
space:
mode:
Diffstat (limited to 'cpp')
-rw-r--r--cpp/include/Ice/OutgoingAsync.h24
-rw-r--r--cpp/include/Ice/Proxy.h77
-rw-r--r--cpp/src/Ice/OutgoingAsync.cpp17
-rw-r--r--cpp/src/Ice/Proxy.cpp117
4 files changed, 0 insertions, 235 deletions
diff --git a/cpp/include/Ice/OutgoingAsync.h b/cpp/include/Ice/OutgoingAsync.h
index a6718de1fe6..99588132c6c 100644
--- a/cpp/include/Ice/OutgoingAsync.h
+++ b/cpp/include/Ice/OutgoingAsync.h
@@ -600,30 +600,6 @@ newCallback(const ::IceInternal::Function<void (const AsyncResultPtr&)>&,
//
// Operation callbacks are specified in Proxy.h
//
-
-//
-// Interfaces for the deprecated AMI mapping.
-//
-
-class ICE_API AMISentCallback
-{
-public:
-
- virtual ~AMISentCallback() { }
-
- virtual void ice_sent() = 0;
-};
-
-class ICE_API AMICallbackBase : virtual public IceUtil::Shared
-{
-public:
-
- virtual void ice_exception(const Exception&) = 0;
-
- void __exception(const Exception&);
- void __sent(bool);
-};
-
}
#endif
diff --git a/cpp/include/Ice/Proxy.h b/cpp/include/Ice/Proxy.h
index 8a17329b44b..6bbd1c7ffe7 100644
--- a/cpp/include/Ice/Proxy.h
+++ b/cpp/include/Ice/Proxy.h
@@ -85,72 +85,6 @@ typedef ::IceUtil::Handle< Callback_Object_ice_flushBatchRequests_Base> Callback
class Callback_Object_ice_getConnection_Base : virtual public ::IceInternal::CallbackBase { };
typedef ::IceUtil::Handle< Callback_Object_ice_getConnection_Base> Callback_Object_ice_getConnectionPtr;
-//
-// Deprecated AMI callbacks
-//
-
-class ICE_API AMI_Object_ice_invoke : public Ice::AMICallbackBase
-{
-public:
-
- virtual void ice_response(bool, const std::vector<Ice::Byte>&) = 0;
-
- void __response(bool ok, const std::vector<Ice::Byte>& outParams)
- {
- ice_response(ok, outParams);
- }
-
- void __exception(const Ice::Exception& ex)
- {
- ice_exception(ex);
- }
-
- void __sent(bool sentSynchronously)
- {
- AMICallbackBase::__sent(sentSynchronously);
- }
-};
-typedef IceUtil::Handle<AMI_Object_ice_invoke> AMI_Object_ice_invokePtr;
-
-class ICE_API AMI_Array_Object_ice_invoke : public Ice::AMICallbackBase
-{
-public:
-
- virtual void ice_response(bool, const std::pair<const Byte*, const Byte*>&) = 0;
-
- void __response(bool ok, const std::pair<const Byte*, const Byte*>& outParams)
- {
- ice_response(ok, outParams);
- }
-
- void __exception(const Ice::Exception& ex)
- {
- ice_exception(ex);
- }
-
- void __sent(bool sentSynchronously)
- {
- AMICallbackBase::__sent(sentSynchronously);
- }
-};
-typedef IceUtil::Handle<AMI_Array_Object_ice_invoke> AMI_Array_Object_ice_invokePtr;
-
-class ICE_API AMI_Object_ice_flushBatchRequests : public Ice::AMICallbackBase
-{
-public:
-
- void __exception(const Ice::Exception& ex)
- {
- ice_exception(ex);
- }
-
- void __sent(bool sentSynchronously)
- {
- AMICallbackBase::__sent(sentSynchronously);
- }
-};
-typedef IceUtil::Handle<AMI_Object_ice_flushBatchRequests> AMI_Object_ice_flushBatchRequestsPtr;
-
}
#ifdef ICE_CPP11
@@ -584,11 +518,6 @@ public:
return ice_invoke(operation, mode, inParams, outParams, &context);
}
- bool ice_invoke_async(const ::Ice::AMI_Object_ice_invokePtr&, const ::std::string&, ::Ice::OperationMode,
- const ::std::vector< ::Ice::Byte>&);
- bool ice_invoke_async(const ::Ice::AMI_Object_ice_invokePtr&, const ::std::string&, ::Ice::OperationMode,
- const ::std::vector< ::Ice::Byte>&, const ::Ice::Context&);
-
#ifdef ICE_CPP11
::Ice::AsyncResultPtr begin_ice_invoke(
const ::std::string& operation,
@@ -714,11 +643,6 @@ public:
return ice_invoke(operation, mode, inParams, outParams, &context);
}
- bool ice_invoke_async(const ::Ice::AMI_Array_Object_ice_invokePtr&, const ::std::string&, ::Ice::OperationMode,
- const ::std::pair<const ::Ice::Byte*, const ::Ice::Byte*>&);
- bool ice_invoke_async(const ::Ice::AMI_Array_Object_ice_invokePtr&, const ::std::string&, ::Ice::OperationMode,
- const ::std::pair<const ::Ice::Byte*, const ::Ice::Byte*>&, const ::Ice::Context&);
-
::Ice::AsyncResultPtr begin_ice_invoke(const ::std::string& operation,
::Ice::OperationMode mode,
const ::std::pair<const ::Ice::Byte*, const ::Ice::Byte*>& inParams)
@@ -874,7 +798,6 @@ public:
::Ice::ConnectionPtr ice_getCachedConnection() const;
void ice_flushBatchRequests();
- bool ice_flushBatchRequests_async(const ::Ice::AMI_Object_ice_flushBatchRequestsPtr&);
#ifdef ICE_CPP11
::Ice::AsyncResultPtr begin_ice_flushBatchRequests(
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)
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-04 13:53:09 +0000