diff options
Diffstat (limited to 'cpp/test/Ice/background/EndpointI.cpp')
| -rw-r--r-- | cpp/test/Ice/background/EndpointI.cpp | 26 |
1 files changed, 20 insertions, 6 deletions
diff --git a/cpp/test/Ice/background/EndpointI.cpp b/cpp/test/Ice/background/EndpointI.cpp index 963681e66db..656ee1fc8aa 100644 --- a/cpp/test/Ice/background/EndpointI.cpp +++ b/cpp/test/Ice/background/EndpointI.cpp @@ -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. @@ -35,8 +35,10 @@ EndpointI::EndpointI(const IceInternal::EndpointIPtr& endpoint) : void EndpointI::streamWrite(IceInternal::BasicStream* s) const { - s->write(type()); + s->startWriteEncaps(); + s->write(_endpoint->type()); _endpoint->streamWrite(s); + s->endWriteEncaps(); } Ice::Short @@ -45,7 +47,7 @@ EndpointI::type() const return (Ice::Short)(TYPE_BASE + _endpoint->type()); } -std::string +const std::string& EndpointI::protocol() const { return _endpoint->protocol(); @@ -57,6 +59,12 @@ EndpointI::timeout() const return _endpoint->timeout(); } +const std::string& +EndpointI::connectionId() const +{ + return _endpoint->connectionId(); +} + IceInternal::EndpointIPtr EndpointI::timeout(int timeout) const { @@ -279,8 +287,14 @@ EndpointI::operator<(const Ice::LocalObject& r) const return *p->_endpoint < *_endpoint; } -Ice::Int -EndpointI::hashInit() const +int +EndpointI::hash() const +{ + return _endpoint->hash(); +} + +string +EndpointI::options() const { - return _endpoint->ice_getHash(); + return _endpoint->options(); } |