1 files changed, 10 insertions, 5 deletions
diff --git a/cpp/src/Ice/WSEndpoint.h b/cpp/src/Ice/WSEndpoint.h
index 0a34d3d6268..8216902d3f9 100644
--- a/cpp/src/Ice/WSEndpoint.h
+++ b/cpp/src/Ice/WSEndpoint.h
@@ -24,25 +24,25 @@ namespace IceInternal
 // Delegate interface implemented by TcpEndpoint or IceSSL::Endpoint or any endpoint that WS can
 // delegate to.
 //
-class ICE_API WSEndpointDelegate : virtual public IceUtil::Shared
+class ICE_API WSEndpointDelegate : public virtual IceUtil::Shared
 {
 public:
 
     virtual Ice::EndpointInfoPtr getWSInfo(const std::string&) const = 0;
 };
 
-class WSEndpoint : public EndpointI
+class WSEndpoint : public EndpointI, public Ice::EnableSharedFromThis<WSEndpoint>
 {
 public:
 
     WSEndpoint(const ProtocolInstancePtr&, const EndpointIPtr&, const std::string&);
     WSEndpoint(const ProtocolInstancePtr&, const EndpointIPtr&, std::vector<std::string>&);
-    WSEndpoint(const ProtocolInstancePtr&, const EndpointIPtr&, BasicStream*);
+    WSEndpoint(const ProtocolInstancePtr&, const EndpointIPtr&, Ice::InputStream*);
 
     virtual Ice::EndpointInfoPtr getInfo() const;
     virtual Ice::Short type() const;
     virtual const std::string& protocol() const;
-    virtual void streamWrite(BasicStream*) const;
+    virtual void streamWrite(Ice::OutputStream*) const;
 
     virtual Ice::Int timeout() const;
     virtual EndpointIPtr timeout(Ice::Int) const;
@@ -65,8 +65,13 @@ public:
     EndpointIPtr delegate() const;
     WSEndpointPtr endpoint(const EndpointIPtr&) const;
 
+#ifdef ICE_CPP11_MAPPING
+    virtual bool operator==(const Ice::Endpoint&) const;
+    virtual bool operator<(const Ice::Endpoint&) const;
+#else
     virtual bool operator==(const Ice::LocalObject&) const;
     virtual bool operator<(const Ice::LocalObject&) const;
+#endif
 
 protected:
 
@@ -92,7 +97,7 @@ public:
     virtual Ice::Short type() const;
     virtual std::string protocol() const;
     virtual EndpointIPtr create(std::vector<std::string>&, bool) const;
-    virtual EndpointIPtr read(BasicStream*) const;
+    virtual EndpointIPtr read(Ice::InputStream*) const;
     virtual void destroy();
 
     virtual EndpointFactoryPtr clone(const ProtocolInstancePtr&) const;