summaryrefslogtreecommitdiff
path: root/cpp/src/Ice/StreamI.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/src/Ice/StreamI.cpp')
-rw-r--r--cpp/src/Ice/StreamI.cpp13
1 files changed, 2 insertions, 11 deletions
diff --git a/cpp/src/Ice/StreamI.cpp b/cpp/src/Ice/StreamI.cpp
index 951d8ac724c..5dda15a3b30 100644
--- a/cpp/src/Ice/StreamI.cpp
+++ b/cpp/src/Ice/StreamI.cpp
@@ -35,17 +35,8 @@ IceInternal::BasicOutputStream::BasicOutputStream(IceInternal::Instance* instanc
Ice::InputStreamI::InputStreamI(const Ice::CommunicatorPtr& communicator, const vector<Byte>& data) :
_communicator(communicator), _is(IceInternal::getInstance(communicator).get(), this)
{
-#if defined(__SUNPRO_CC)
- //
- // COMPILERFIX: No idea why Sun CC needs this.
- //
- vector<Byte> copy = data;
- _is.b.swap(copy);
+ _is.b.copyFromVector(data);
_is.i = _is.b.begin();
-#else
- _is.b = data;
- _is.i = _is.b.begin();
-#endif
}
Ice::InputStreamI::~InputStreamI()
@@ -450,7 +441,7 @@ Ice::OutputStreamI::writePendingObjects()
void
Ice::OutputStreamI::finished(vector<Byte>& bytes)
{
- bytes.swap(_os.b);
+ _os.b.copyToVector(bytes);
}
//