merging javascript branch

1 files changed, 26 insertions, 28 deletions

diff --git a/cpp/src/Ice/TcpEndpointI.h b/cpp/src/Ice/TcpEndpointI.h
index 5d3cb602ed0..93f9a37445e 100644
--- a/cpp/src/Ice/TcpEndpointI.h
+++ b/cpp/src/Ice/TcpEndpointI.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.
@@ -11,58 +11,54 @@
 #define ICE_TCP_ENDPOINT_I_H
 
 #include <IceUtil/Config.h>
-#include <Ice/EndpointI.h>
+#include <Ice/IPEndpointI.h>
 #include <Ice/EndpointFactory.h>
 #include <Ice/Network.h> // for IceIternal::Address
 
 namespace IceInternal
 {
 
-class TcpEndpointI : public EndpointI
+class TcpEndpointI : public IPEndpointI
 {
 public:
 
-    TcpEndpointI(const InstancePtr&, const std::string&, Ice::Int, Ice::Int, const std::string&, bool);
-    TcpEndpointI(const InstancePtr&, const std::string&, bool);
-    TcpEndpointI(BasicStream*);
+    TcpEndpointI(const ProtocolInstancePtr&, const std::string&, Ice::Int, Ice::Int, const std::string&, bool);
+    TcpEndpointI(const ProtocolInstancePtr&);
+    TcpEndpointI(const ProtocolInstancePtr&, BasicStream*);
 
-    virtual void streamWrite(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 EndpointIPtr timeout(Ice::Int) const;
-    virtual EndpointIPtr connectionId(const ::std::string&) const;
     virtual bool compress() const;
     virtual EndpointIPtr compress(bool) const;
     virtual bool datagram() const;
     virtual bool secure() const;
+
     virtual TransceiverPtr transceiver(EndpointIPtr&) const;
-    virtual std::vector<ConnectorPtr> connectors(Ice::EndpointSelectionType) const;
-    virtual void connectors_async(Ice::EndpointSelectionType, const EndpointI_connectorsPtr&) const;
     virtual AcceptorPtr acceptor(EndpointIPtr&, const std::string&) const;
-    virtual std::vector<EndpointIPtr> expand() const;
-    virtual bool equivalent(const EndpointIPtr&) const;
-    virtual std::vector<ConnectorPtr> connectors(const std::vector<Address>&, const 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 EndpointI::connectionId;
-#endif
+    using IPEndpointI::connectionId;
 
-private:
+protected:
 
-    virtual ::Ice::Int hashInit() const;
+    virtual void streamWriteImpl(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 ConnectorPtr createConnector(const Address&, const NetworkProxyPtr&) const;
+    virtual 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;
 };
@@ -75,18 +71,20 @@ public:
 
     virtual Ice::Short type() const;
     virtual std::string protocol() const;
-    virtual EndpointIPtr create(const std::string&, bool) const;
+    virtual EndpointIPtr create(std::vector<std::string>&, bool) const;
     virtual EndpointIPtr read(BasicStream*) const;
     virtual void destroy();
 
+    virtual EndpointFactoryPtr clone(const ProtocolInstancePtr&) const;
+
 private:
 
-    TcpEndpointFactory(const InstancePtr&);
+    TcpEndpointFactory(const ProtocolInstancePtr&);
     friend class Instance;
 
-    InstancePtr _instance;
+    ProtocolInstancePtr _instance;
 };
-
+    
 }
 
 #endif