1 files changed, 23 insertions, 24 deletions

diff --git a/cpp/src/IceSSL/EndpointI.h b/cpp/src/IceSSL/EndpointI.h
index d5ffa52eccd..68d14fa9d5b 100644
--- a/cpp/src/IceSSL/EndpointI.h
+++ b/cpp/src/IceSSL/EndpointI.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.
@@ -10,7 +10,7 @@
 #ifndef ICE_SSL_ENDPOINT_I_H
 #define ICE_SSL_ENDPOINT_I_H
 
-#include <Ice/EndpointI.h>
+#include <Ice/IPEndpointI.h>
 #include <Ice/EndpointFactory.h>
 #include <IceSSL/InstanceF.h>
 #include <IceSSL/EndpointInfo.h>
@@ -19,52 +19,49 @@
 namespace IceSSL
 {
 
-class EndpointI : public IceInternal::EndpointI
+class EndpointI : public IceInternal::IPEndpointI
 {
 public:
 
     EndpointI(const InstancePtr&, const std::string&, Ice::Int, Ice::Int, const std::string&, bool);
-    EndpointI(const InstancePtr&, const std::string&, bool);
+    EndpointI(const InstancePtr&);
     EndpointI(const InstancePtr&, IceInternal::BasicStream*);
 
-    virtual void streamWrite(IceInternal::BasicStream*) const;
-    virtual std::string toString() const;
     virtual Ice::EndpointInfoPtr getInfo() const;
-    virtual Ice::Short type() const;
-    virtual std::string protocol() const;
+
     virtual Ice::Int timeout() const;
     virtual IceInternal::EndpointIPtr timeout(Ice::Int) const;
-    virtual IceInternal::EndpointIPtr connectionId(const ::std::string&) const;
     virtual bool compress() const;
     virtual IceInternal::EndpointIPtr compress(bool) const;
     virtual bool datagram() const;
     virtual bool secure() const;
+
     virtual IceInternal::TransceiverPtr transceiver(IceInternal::EndpointIPtr&) const;
-    virtual std::vector<IceInternal::ConnectorPtr> connectors(Ice::EndpointSelectionType) const;
-    virtual void connectors_async(Ice::EndpointSelectionType, const IceInternal::EndpointI_connectorsPtr&) const;
     virtual IceInternal::AcceptorPtr acceptor(IceInternal::EndpointIPtr&, const std::string&) const;
-    virtual std::vector<IceInternal::EndpointIPtr> expand() const;
-    virtual bool equivalent(const IceInternal::EndpointIPtr&) const;
-    virtual std::vector<IceInternal::ConnectorPtr> connectors(const std::vector<IceInternal::Address>&,
-                                                              const IceInternal::NetworkProxyPtr&) const;    
+    virtual std::string options() const;
 
     virtual bool operator==(const Ice::LocalObject&) const;
     virtual bool operator<(const Ice::LocalObject&) const;
 
-#ifdef __SUNPRO_CC
-    using IceInternal::EndpointI::connectionId;
-#endif
+    using IceInternal::IPEndpointI::connectionId;
 
-private:
+protected:
+
+    virtual void streamWriteImpl(IceInternal::BasicStream*) const;
+    virtual void hashInit(Ice::Int&) const;
+    virtual void fillEndpointInfo(Ice::IPEndpointInfo*) const;
+    virtual bool checkOption(const std::string&, const std::string&, const std::string&);
 
-    virtual ::Ice::Int hashInit() const;
+    virtual IceInternal::ConnectorPtr createConnector(const IceInternal::Address&, 
+                                                      const IceInternal::NetworkProxyPtr&) const;
+    virtual IceInternal::IPEndpointIPtr createEndpoint(const std::string&, int, const std::string&) const;
+
+private:
 
     //
     // All members are const, because endpoints are immutable.
     //
     const InstancePtr _instance;
-    const std::string _host;
-    const Ice::Int _port;
     const Ice::Int _timeout;
     const bool _compress;
 };
@@ -77,14 +74,16 @@ public:
 
     virtual Ice::Short type() const;
     virtual std::string protocol() const;
-    virtual IceInternal::EndpointIPtr create(const std::string&, bool) const;
+    virtual IceInternal::EndpointIPtr create(std::vector<std::string>&, bool) const;
     virtual IceInternal::EndpointIPtr read(IceInternal::BasicStream*) const;
     virtual void destroy();
 
+    virtual IceInternal::EndpointFactoryPtr clone(const IceInternal::ProtocolInstancePtr&) const;
+
 private:
 
     EndpointFactoryI(const InstancePtr&);
-    friend class Instance;
+    friend class PluginI;
 
     InstancePtr _instance;
 };