diff options
Diffstat (limited to 'cpp/src/Ice/StreamI.cpp')
| -rw-r--r-- | cpp/src/Ice/StreamI.cpp | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/cpp/src/Ice/StreamI.cpp b/cpp/src/Ice/StreamI.cpp index e6e3bf00250..5475f659f54 100644 --- a/cpp/src/Ice/StreamI.cpp +++ b/cpp/src/Ice/StreamI.cpp @@ -8,6 +8,7 @@ // ********************************************************************** #include <Ice/StreamI.h> +#include <Ice/Initialize.h> using namespace std; using namespace Ice; @@ -31,8 +32,8 @@ IceInternal::BasicOutputStream::BasicOutputStream(IceInternal::Instance* instanc // // InputStreamI // -Ice::InputStreamI::InputStreamI(const IceInternal::InstancePtr& instance, const vector<Byte>& data) : - _is(instance.get(), this), _readObjects(false) +Ice::InputStreamI::InputStreamI(const Ice::CommunicatorPtr& communicator, const vector<Byte>& data) : + _communicator(communicator), _is(IceInternal::getInstance(communicator).get(), this), _readObjects(false) { _is.b = data; _is.i = _is.b.begin(); @@ -42,6 +43,12 @@ Ice::InputStreamI::~InputStreamI() { } +CommunicatorPtr +Ice::InputStreamI::communicator() const +{ + return _communicator; +} + void Ice::InputStreamI::sliceObjects(bool b) { @@ -252,8 +259,8 @@ Ice::InputStreamI::finished() // // OutputStreamI // -Ice::OutputStreamI::OutputStreamI(const IceInternal::InstancePtr& instance) : - _os(instance.get(), this), _writeObjects(false) +Ice::OutputStreamI::OutputStreamI(const Ice::CommunicatorPtr& communicator) : + _communicator(communicator), _os(IceInternal::getInstance(communicator).get(), this), _writeObjects(false) { } @@ -261,6 +268,12 @@ Ice::OutputStreamI::~OutputStreamI() { } +CommunicatorPtr +Ice::OutputStreamI::communicator() const +{ + return _communicator; +} + void Ice::OutputStreamI::writeBool(bool v) { |