IOCP changes, bug 3501, 4200, 4156, 3101

1 files changed, 11 insertions, 11 deletions

diff --git a/cpp/src/Ice/Transceiver.h b/cpp/src/Ice/Transceiver.h
index f2c08648eb2..56b23a61bcf 100644
--- a/cpp/src/Ice/Transceiver.h
+++ b/cpp/src/Ice/Transceiver.h
@@ -12,31 +12,31 @@
 
 #include <IceUtil/Shared.h>
 #include <Ice/TransceiverF.h>
-#include <Ice/SelectorF.h>
-
-#ifdef _WIN32
-#   include <winsock2.h>
-typedef int ssize_t;
-#else
-#   define SOCKET int
-#endif
+#include <Ice/Network.h>
 
 namespace IceInternal
 {
 
 class Buffer;
 
-class ICE_API Transceiver : public ::IceUtil::Shared
+class ICE_API Transceiver : virtual public ::IceUtil::Shared
 {
 public:
     
-    virtual SOCKET fd() = 0;
+    virtual NativeInfoPtr getNativeInfo() = 0;
+    virtual SocketOperation initialize() = 0;
     virtual void close() = 0;
     virtual bool write(Buffer&) = 0;
     virtual bool read(Buffer&) = 0;
+#ifdef ICE_USE_IOCP
+    virtual void startWrite(Buffer&) = 0;
+    virtual void finishWrite(Buffer&) = 0;
+    virtual void startRead(Buffer&) = 0;
+    virtual void finishRead(Buffer&) = 0;
+#endif
     virtual std::string type() const = 0;
     virtual std::string toString() const = 0;
-    virtual SocketStatus initialize() = 0;
+
     virtual void checkSendSize(const Buffer&, size_t) = 0;
 };