diff options
| author | Mark Spruiell <mes@zeroc.com> | 2014-03-19 12:45:55 -0700 |
|---|---|---|
| committer | Mark Spruiell <mes@zeroc.com> | 2014-03-19 12:45:55 -0700 |
| commit | cdcffbcc3c3c052afdeb772ff0167e7a90b525bb (patch) | |
| tree | 4f16ee41ef7d33394c44e9db81e4d6cd89908250 /cpp/src/Ice/OpaqueEndpointI.h | |
| parent | fixing testicedist.py for 5487 (diff) | |
| download | ice-cdcffbcc3c3c052afdeb772ff0167e7a90b525bb.tar.bz2 ice-cdcffbcc3c3c052afdeb772ff0167e7a90b525bb.tar.xz ice-cdcffbcc3c3c052afdeb772ff0167e7a90b525bb.zip | |
merging javascript branch
Diffstat (limited to 'cpp/src/Ice/OpaqueEndpointI.h')
| -rw-r--r-- | cpp/src/Ice/OpaqueEndpointI.h | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/cpp/src/Ice/OpaqueEndpointI.h b/cpp/src/Ice/OpaqueEndpointI.h index 9b1fa832580..79ef92b7a97 100644 --- a/cpp/src/Ice/OpaqueEndpointI.h +++ b/cpp/src/Ice/OpaqueEndpointI.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. @@ -20,39 +20,41 @@ class OpaqueEndpointI : public EndpointI { public: - OpaqueEndpointI(const ::std::string&); + OpaqueEndpointI(std::vector<std::string>&); OpaqueEndpointI(Ice::Short, 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 const std::string& protocol() const; + virtual Ice::Int timeout() const; virtual EndpointIPtr timeout(Ice::Int) const; + virtual const std::string& connectionId() 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 Ice::Int hash() 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 protected: - virtual ::Ice::Int hashInit() const; - using EndpointI::connectors; + virtual bool checkOption(const std::string&, const std::string&, const std::string&); private: |