summaryrefslogtreecommitdiff
path: root/cpp/include/Ice/StreamHelpers.h
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2013-01-28 10:02:20 +0100
committerBenoit Foucher <benoit@zeroc.com>2013-01-28 10:02:20 +0100
commitbef2397c9d92424a02d8863bf02753f5e48a9220 (patch)
tree35f796cc4f7fe907ad531955963e3932d17e747d /cpp/include/Ice/StreamHelpers.h
parentFixed (ICE-4842) - cpp::array unused parameter in generated async callbacks (diff)
downloadice-bef2397c9d92424a02d8863bf02753f5e48a9220.tar.bz2
ice-bef2397c9d92424a02d8863bf02753f5e48a9220.tar.xz
ice-bef2397c9d92424a02d8863bf02753f5e48a9220.zip
Fixed ICE-5188 and ICE-5190: release for ScopedArray, aligned BasicStream and InputStream zero-copy methods
Diffstat (limited to 'cpp/include/Ice/StreamHelpers.h')
-rw-r--r--cpp/include/Ice/StreamHelpers.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/cpp/include/Ice/StreamHelpers.h b/cpp/include/Ice/StreamHelpers.h
index ef6b8bf6510..f883285cd44 100644
--- a/cpp/include/Ice/StreamHelpers.h
+++ b/cpp/include/Ice/StreamHelpers.h
@@ -436,7 +436,7 @@ struct StreamHelper<std::pair<IceUtil::ScopedArray<T>, std::pair<const T*, const
template<class S> static inline void
read(S* stream, std::pair<IceUtil::ScopedArray<T>, std::pair<const T*, const T*> >& v)
{
- v.first.reset(stream->read(v.second));
+ stream->read(v.second, v.first);
}
// no write: only used for unmarshaling