1 files changed, 3 insertions, 60 deletions
diff --git a/cpp/src/qpid/sys/Socket.h b/cpp/src/qpid/sys/Socket.h
index ea03222aed..bb1ef27e65 100644
--- a/cpp/src/qpid/sys/Socket.h
+++ b/cpp/src/qpid/sys/Socket.h
@@ -22,67 +22,10 @@
  *
  */
 
-#include <string>
-#include "Time.h"
-
-#ifdef USE_APR
-#include <apr_network_io.h>
-#endif
-
-namespace qpid {
-namespace sys {
-
-class Socket
-{
-  public:
-    /** Create an initialized TCP socket */
-    static Socket createTcp();
-
-    /** Create a socket wrapper for descriptor. */
-#ifdef USE_APR
-    Socket(apr_socket_t* descriptor = 0);
-#else
-    Socket(int descriptor = 0);
-#endif
-    
-    /** Set timeout for read and write */
-    void setTimeout(Time interval);
-
-    void connect(const std::string& host, int port);
-
-    void close();
-
-    enum { SOCKET_TIMEOUT=-2, SOCKET_EOF=-3 } ErrorCode;
-
-    /** Returns bytes sent or an ErrorCode value < 0. */
-    ssize_t send(const void* data, size_t size);
-
-    /**
-     * Returns bytes received, an ErrorCode value < 0 or 0
-     * if the connection closed in an orderly manner.
-     */
-    ssize_t recv(void* data, size_t size);
-
-    /** Bind to a port and start listening.
-     *@param port 0 means choose an available port.
-     *@param backlog maximum number of pending connections.
-     *@return The bound port.
-     */
-    int listen(int port = 0, int backlog = 10);
-
-    /** Get file descriptor */
-    int fd(); 
-    
-  private:
-#ifdef USE_APR    
-    apr_socket_t* socket;
+#ifdef USE_APR_PLATFORM
+#include "apr/Socket.h"
 #else
-    void init() const;
-    mutable int socket;         // Initialized on demand. 
+#include "posix/Socket.h"
 #endif
-};
-
-}}
-
 
 #endif  /*!_sys_Socket_h*/