merging javascript branch

1 files changed, 9 insertions, 5 deletions

diff --git a/cpp/src/Ice/Transceiver.h b/cpp/src/Ice/Transceiver.h
index c2c00cf151d..0849f6c735f 100644
--- a/cpp/src/Ice/Transceiver.h
+++ b/cpp/src/Ice/Transceiver.h
@@ -1,6 +1,6 @@
 // **********************************************************************
 //
-// Copyright (c) 2003-2013 ZeroC, Inc. All rights reserved.
+// Copyright (c) 2003-2014 ZeroC, Inc. All rights reserved.
 //
 // This copy of Ice is licensed to you under the terms described in the
 // ICE_LICENSE file included in this distribution.
@@ -25,17 +25,21 @@ class ICE_API Transceiver : virtual public ::IceUtil::Shared
 public:
     
     virtual NativeInfoPtr getNativeInfo() = 0;
-    virtual SocketOperation initialize(Buffer&, Buffer&) = 0;
+    
+    virtual SocketOperation initialize(Buffer&, Buffer&, bool&) = 0;
+    virtual SocketOperation closing(bool, const Ice::LocalException&) = 0;
     virtual void close() = 0;
-    virtual bool write(Buffer&) = 0;
-    virtual bool read(Buffer&) = 0;
+
+    virtual SocketOperation write(Buffer&) = 0;
+    virtual SocketOperation read(Buffer&, bool&) = 0;
 #if defined(ICE_USE_IOCP) || defined(ICE_OS_WINRT)
     virtual bool 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 protocol() const = 0;
     virtual std::string toString() const = 0;
     virtual Ice::ConnectionInfoPtr getInfo() const = 0;
     virtual void checkSendSize(const Buffer&, size_t) = 0;