2 files changed, 43 insertions, 86 deletions
diff --git a/cpp/include/Ice/OutgoingAsync.h b/cpp/include/Ice/OutgoingAsync.h
index f401975a569..c82884f5ab9 100644
--- a/cpp/include/Ice/OutgoingAsync.h
+++ b/cpp/include/Ice/OutgoingAsync.h
@@ -304,92 +304,6 @@ protected:
     bool _synchronous;
 };
 
-//
-// Class for handling the proxy's begin_ice_flushBatchRequest request.
-//
-class ICE_API ProxyFlushBatchAsync : public ProxyOutgoingAsyncBase
-{
-public:
-
-    ProxyFlushBatchAsync(const Ice::ObjectPrxPtr&);
-
-    virtual AsyncStatus invokeRemote(const Ice::ConnectionIPtr&, bool, bool);
-    virtual AsyncStatus invokeCollocated(CollocatedRequestHandler*);
-
-    void invoke(const std::string&);
-
-private:
-
-    int _batchRequestNum;
-};
-typedef IceUtil::Handle<ProxyFlushBatchAsync> ProxyFlushBatchAsyncPtr;
-
-//
-// Class for handling the proxy's begin_ice_getConnection request.
-//
-class ICE_API ProxyGetConnection :  public ProxyOutgoingAsyncBase
-{
-public:
-
-    ProxyGetConnection(const Ice::ObjectPrxPtr&);
-
-    virtual AsyncStatus invokeRemote(const Ice::ConnectionIPtr&, bool, bool);
-    virtual AsyncStatus invokeCollocated(CollocatedRequestHandler*);
-
-    virtual Ice::ConnectionPtr getConnection() const;
-
-    void invoke(const std::string&);
-};
-typedef IceUtil::Handle<ProxyGetConnection> ProxyGetConnectionPtr;
-
-//
-// Class for handling Ice::Connection::begin_flushBatchRequests
-//
-class ICE_API ConnectionFlushBatchAsync : public OutgoingAsyncBase
-{
-public:
-
-    ConnectionFlushBatchAsync(const Ice::ConnectionIPtr&, const InstancePtr&);
-
-    virtual Ice::ConnectionPtr getConnection() const;
-
-    void invoke(const std::string&);
-
-private:
-
-    const Ice::ConnectionIPtr _connection;
-};
-typedef IceUtil::Handle<ConnectionFlushBatchAsync> ConnectionFlushBatchAsyncPtr;
-
-//
-// Class for handling Ice::Communicator::begin_flushBatchRequests
-//
-class ICE_API CommunicatorFlushBatchAsync : public OutgoingAsyncBase
-{
-public:
-
-    virtual ~CommunicatorFlushBatchAsync();
-
-    CommunicatorFlushBatchAsync(const InstancePtr&);
-
-    void flushConnection(const Ice::ConnectionIPtr&);
-    void invoke(const std::string&);
-
-#ifdef ICE_CPP11_MAPPING
-    std::shared_ptr<CommunicatorFlushBatchAsync> shared_from_this()
-    {
-        return std::static_pointer_cast<CommunicatorFlushBatchAsync>(OutgoingAsyncBase::shared_from_this());
-    }
-#endif
-
-private:
-
-    void check(bool);
-
-    int _useCount;
-    InvocationObserver _observer;
-};
-
 }
 
 namespace IceInternal
diff --git a/cpp/include/Ice/Proxy.h b/cpp/include/Ice/Proxy.h
index e996c1324ab..461c873ccdd 100644
--- a/cpp/include/Ice/Proxy.h
+++ b/cpp/include/Ice/Proxy.h
@@ -38,6 +38,49 @@ ICE_API extern const Context noExplicitContext;
 
 }
 
+namespace IceInternal
+{
+
+//
+// Class for handling the proxy's begin_ice_flushBatchRequest request.
+//
+class ICE_API ProxyFlushBatchAsync : public ProxyOutgoingAsyncBase
+{
+public:
+
+    ProxyFlushBatchAsync(const Ice::ObjectPrxPtr&);
+
+    virtual AsyncStatus invokeRemote(const Ice::ConnectionIPtr&, bool, bool);
+    virtual AsyncStatus invokeCollocated(CollocatedRequestHandler*);
+
+    void invoke(const std::string&);
+
+private:
+
+    int _batchRequestNum;
+};
+typedef IceUtil::Handle<ProxyFlushBatchAsync> ProxyFlushBatchAsyncPtr;
+
+//
+// Class for handling the proxy's begin_ice_getConnection request.
+//
+class ICE_API ProxyGetConnection :  public ProxyOutgoingAsyncBase
+{
+public:
+
+    ProxyGetConnection(const Ice::ObjectPrxPtr&);
+
+    virtual AsyncStatus invokeRemote(const Ice::ConnectionIPtr&, bool, bool);
+    virtual AsyncStatus invokeCollocated(CollocatedRequestHandler*);
+
+    virtual Ice::ConnectionPtr getConnection() const;
+
+    void invoke(const std::string&);
+};
+typedef IceUtil::Handle<ProxyGetConnection> ProxyGetConnectionPtr;
+
+}
+
 #ifdef ICE_CPP11_MAPPING // C++11 mapping
 
 namespace IceInternal