1 files changed, 14 insertions, 17 deletions
diff --git a/cpp/src/Ice/WSEndpoint.h b/cpp/src/Ice/WSEndpoint.h
index ba5359ed6df..23ffe0ddb1e 100644
--- a/cpp/src/Ice/WSEndpoint.h
+++ b/cpp/src/Ice/WSEndpoint.h
@@ -20,29 +20,22 @@
 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
-{
-public:
-
-    virtual Ice::EndpointInfoPtr getWSInfo(const std::string&) const = 0;
-};
-
 class WSEndpoint : public EndpointI
+#ifdef ICE_CPP11_MAPPING
+                 , public std::enable_shared_from_this<WSEndpoint>
+#endif
 {
 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 void streamWriteImpl(Ice::OutputStream*) const;
 
     virtual Ice::EndpointInfoPtr getInfo() const;
     virtual Ice::Short type() const;
     virtual const std::string& protocol() const;
-    virtual void streamWrite(BasicStream*) const;
 
     virtual Ice::Int timeout() const;
     virtual EndpointIPtr timeout(Ice::Int) const;
@@ -62,11 +55,15 @@ public:
     virtual ::Ice::Int hash() const;
     virtual std::string options() const;
 
-    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:
 
@@ -78,7 +75,7 @@ private:
     // All members are const, because endpoints are immutable.
     //
     const ProtocolInstancePtr _instance;
-    const IPEndpointIPtr _delegate;
+    const EndpointIPtr _delegate;
     const std::string _resource;
 };
 
@@ -92,10 +89,10 @@ 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;
+    virtual EndpointFactoryPtr clone(const ProtocolInstancePtr&, const EndpointFactoryPtr&) const;
 
 private: