summaryrefslogtreecommitdiff
path: root/cpp/src/Ice/BasicStream.cpp
diff options
context:
space:
mode:
authorMarc Laukien <marc@zeroc.com>2002-12-30 05:19:03 +0000
committerMarc Laukien <marc@zeroc.com>2002-12-30 05:19:03 +0000
commita8f175455eeb6ab82cdd4b15edbc8f480b2ad5dc (patch)
tree22552b21c83ead223a3c2f4f5a409d0196358135 /cpp/src/Ice/BasicStream.cpp
parentfixes (diff)
downloadice-a8f175455eeb6ab82cdd4b15edbc8f480b2ad5dc.tar.bz2
ice-a8f175455eeb6ab82cdd4b15edbc8f480b2ad5dc.tar.xz
ice-a8f175455eeb6ab82cdd4b15edbc8f480b2ad5dc.zip
fixes
Diffstat (limited to 'cpp/src/Ice/BasicStream.cpp')
-rw-r--r--cpp/src/Ice/BasicStream.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/cpp/src/Ice/BasicStream.cpp b/cpp/src/Ice/BasicStream.cpp
index c2264742437..2d491777b6a 100644
--- a/cpp/src/Ice/BasicStream.cpp
+++ b/cpp/src/Ice/BasicStream.cpp
@@ -31,14 +31,14 @@ const string IceInternal::BasicStream::_emptyString;
const string IceInternal::BasicStream::_iceObjectId("::Ice::Object");
const string IceInternal::BasicStream::_userExceptionId("::Ice::UserException");
-IceInternal::BasicStream::BasicStream(const InstancePtr& instance) :
+IceInternal::BasicStream::BasicStream(Instance* instance) :
_instance(instance),
_currentReadEncaps(0),
_currentWriteEncaps(0)
{
}
-const InstancePtr&
+Instance*
IceInternal::BasicStream::instance() const
{
return _instance;
@@ -47,7 +47,7 @@ IceInternal::BasicStream::instance() const
void
IceInternal::BasicStream::swap(BasicStream& other)
{
- assert(_instance.get() == other._instance.get());
+ assert(_instance == other._instance);
b.swap(other.b);
std::swap(i, other.i);