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/Ice/ReferenceFactory.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/Ice/ReferenceFactory.cpp')
| -rw-r--r-- | cpp/src/Ice/ReferenceFactory.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cpp/src/Ice/ReferenceFactory.cpp b/cpp/src/Ice/ReferenceFactory.cpp index fd6a833311d..c2ee1ad2452 100644 --- a/cpp/src/Ice/ReferenceFactory.cpp +++ b/cpp/src/Ice/ReferenceFactory.cpp @@ -20,7 +20,7 @@ #include <Ice/LocatorInfo.h> #include <Ice/Locator.h> #include <Ice/LoggerUtil.h> -#include <Ice/BasicStream.h> +#include <Ice/InputStream.h> #include <Ice/Properties.h> #include <Ice/DefaultsAndOverrides.h> #include <Ice/PropertyNames.h> @@ -586,7 +586,7 @@ IceInternal::ReferenceFactory::create(const string& str, const string& propertyP } ReferencePtr -IceInternal::ReferenceFactory::create(const Identity& ident, BasicStream* s) +IceInternal::ReferenceFactory::create(const Identity& ident, InputStream* s) { // // Don't read the identity here. Operations calling this @@ -626,7 +626,7 @@ IceInternal::ReferenceFactory::create(const Identity& ident, BasicStream* s) Ice::ProtocolVersion protocol; Ice::EncodingVersion encoding; - if(s->getReadEncoding() != Ice::Encoding_1_0) + if(s->getEncoding() != Ice::Encoding_1_0) { s->read(protocol); s->read(encoding); |