diff options
| author | Mark Spruiell <mes@zeroc.com> | 2016-01-19 16:46:11 -0800 |
|---|---|---|
| committer | Mark Spruiell <mes@zeroc.com> | 2016-01-19 16:46:11 -0800 |
| commit | d5dd7c866e9e1dc59dc7e127eb39f641530bf823 (patch) | |
| tree | 61771e4f322a7138b643d5325a6d10acea30fb84 /cpp/src/IceBT/EndpointI.cpp | |
| parent | Deprecate ice_name and add ice_id (diff) | |
| download | ice-d5dd7c866e9e1dc59dc7e127eb39f641530bf823.tar.bz2 ice-d5dd7c866e9e1dc59dc7e127eb39f641530bf823.tar.xz ice-d5dd7c866e9e1dc59dc7e127eb39f641530bf823.zip | |
ICE-6861 - removing public stream API
Diffstat (limited to 'cpp/src/IceBT/EndpointI.cpp')
| -rw-r--r-- | cpp/src/IceBT/EndpointI.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/cpp/src/IceBT/EndpointI.cpp b/cpp/src/IceBT/EndpointI.cpp index eb79425fce3..5820316c6ea 100644 --- a/cpp/src/IceBT/EndpointI.cpp +++ b/cpp/src/IceBT/EndpointI.cpp @@ -14,7 +14,8 @@ #include <IceBT/Instance.h> #include <IceBT/Util.h> -#include <Ice/BasicStream.h> +#include <Ice/OutputStream.h> +#include <Ice/InputStream.h> #include <Ice/DefaultsAndOverrides.h> #include <Ice/HashUtil.h> #include <Ice/LocalException.h> @@ -72,7 +73,7 @@ IceBT::EndpointI::EndpointI(const InstancePtr& instance) : { } -IceBT::EndpointI::EndpointI(const InstancePtr& instance, IceInternal::BasicStream* s) : +IceBT::EndpointI::EndpointI(const InstancePtr& instance, InputStream* s) : _instance(instance), _channel(0), _timeout(-1), @@ -91,17 +92,17 @@ IceBT::EndpointI::EndpointI(const InstancePtr& instance, IceInternal::BasicStrea } void -IceBT::EndpointI::streamWrite(IceInternal::BasicStream* s) const +IceBT::EndpointI::streamWrite(OutputStream* s) const { // // _name and _channel are not marshaled. // - s->startWriteEncaps(); + s->startEncapsulation(); s->write(_addr, false); s->write(_uuid, false); s->write(_timeout); s->write(_compress); - s->endWriteEncaps(); + s->endEncapsulation(); } Ice::Short @@ -745,7 +746,7 @@ IceBT::EndpointFactoryI::create(vector<string>& args, bool oaEndpoint) const } IceInternal::EndpointIPtr -IceBT::EndpointFactoryI::read(IceInternal::BasicStream* s) const +IceBT::EndpointFactoryI::read(InputStream* s) const { return ICE_MAKE_SHARED(EndpointI, _instance, s); } |