3 files changed, 5 insertions, 44 deletions
diff --git a/cpp/src/qpid/sys/Socket.h b/cpp/src/qpid/sys/Socket.h
index 9a1e0afc77..45a8bb588e 100644
--- a/cpp/src/qpid/sys/Socket.h
+++ b/cpp/src/qpid/sys/Socket.h
@@ -21,6 +21,7 @@
  * under the License.
  *
  */
+
 #include "IOHandle.h"
 
 #include <string>
@@ -51,17 +52,6 @@ public:
 
     void close() const;
 
-    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) const;
-
-    /**
-     * 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) const;
-
     /** Bind to a port and start listening.
      *@param port 0 means choose an available port.
      *@param backlog maximum number of pending connections.
diff --git a/cpp/src/qpid/sys/posix/Socket.cpp b/cpp/src/qpid/sys/posix/Socket.cpp
index c742b08c64..65345219f0 100644
--- a/cpp/src/qpid/sys/posix/Socket.cpp
+++ b/cpp/src/qpid/sys/posix/Socket.cpp
@@ -167,31 +167,6 @@ Socket::close() const
     socket = -1;
 }
 
-ssize_t
-Socket::send(const void* data, size_t size) const
-{
-    const int& socket = impl->fd;
-    ssize_t sent = ::send(socket, data, size, 0);
-    if (sent < 0) {
-        if (errno == ECONNRESET) return SOCKET_EOF;
-        if (errno == ETIMEDOUT) return SOCKET_TIMEOUT;
-        throw QPID_POSIX_ERROR(errno);
-    }
-    return sent;
-}
-
-ssize_t
-Socket::recv(void* data, size_t size) const
-{
-    const int& socket = impl->fd;
-    ssize_t received = ::recv(socket, data, size, 0);
-    if (received < 0) {
-        if (errno == ETIMEDOUT) return SOCKET_TIMEOUT;
-        throw QPID_POSIX_ERROR(errno);
-    }
-    return received;
-}
-
 int Socket::listen(uint16_t port, int backlog) const
 {
     const int& socket = impl->fd;
diff --git a/cpp/src/qpid/sys/posix/Thread.h b/cpp/src/qpid/sys/posix/Thread.h
index 7d51ec73aa..dae2b5ca11 100644
--- a/cpp/src/qpid/sys/posix/Thread.h
+++ b/cpp/src/qpid/sys/posix/Thread.h
@@ -22,6 +22,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "check.h"
 #include <pthread.h>
 
@@ -40,8 +44,6 @@ class Thread
      */
     static unsigned long logId() { return current().id(); }
 
-    inline static void yield();
-
     inline Thread();
     inline explicit Thread(qpid::sys::Runnable*);
     inline explicit Thread(qpid::sys::Runnable&);
@@ -82,11 +84,5 @@ Thread Thread::current() {
     return Thread(pthread_self());
 }
 
-void Thread::yield() 
-{
-    QPID_POSIX_ASSERT_THROW_IF(pthread_yield());
-}
-
-
 }}
 #endif  /*!_sys_posix_Thread_h*/