diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2013-01-28 10:02:20 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2013-01-28 10:02:20 +0100 |
| commit | bef2397c9d92424a02d8863bf02753f5e48a9220 (patch) | |
| tree | 35f796cc4f7fe907ad531955963e3932d17e747d /cpp/src/Ice/StreamI.cpp | |
| parent | Fixed (ICE-4842) - cpp::array unused parameter in generated async callbacks (diff) | |
| download | ice-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/src/Ice/StreamI.cpp')
| -rw-r--r-- | cpp/src/Ice/StreamI.cpp | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/cpp/src/Ice/StreamI.cpp b/cpp/src/Ice/StreamI.cpp index d204bba06bb..04e616c0a49 100644 --- a/cpp/src/Ice/StreamI.cpp +++ b/cpp/src/Ice/StreamI.cpp @@ -226,7 +226,7 @@ InputStreamI::read(vector<bool>& v) void InputStreamI::read(pair<const bool*, const bool*>& p, ::IceUtil::ScopedArray<bool>& result) { - result.reset(_is->read(p)); + _is->read(p, result); } void @@ -237,32 +237,31 @@ InputStreamI::read(pair<const Byte*, const Byte*>& p) void InputStreamI::read(pair<const Short*, const Short*>& p, ::IceUtil::ScopedArray<Short>& result) { - result.reset(_is->read(p)); + _is->read(p, result); } void InputStreamI::read(pair<const Int*, const Int*>& p, ::IceUtil::ScopedArray<Int>& result) { - result.reset(_is->read(p)); + _is->read(p, result); } void InputStreamI::read(pair<const Long*, const Long*>& p, ::IceUtil::ScopedArray<Long>& result) { - result.reset(_is->read(p)); + _is->read(p, result); } void InputStreamI::read(pair<const Float*, const Float*>& p, ::IceUtil::ScopedArray<Float>& result) { - result.reset(_is->read(p)); + _is->read(p, result); } void -InputStreamI::read(pair<const Double*, const Double*>& p, - ::IceUtil::ScopedArray<Double>& result) +InputStreamI::read(pair<const Double*, const Double*>& p, ::IceUtil::ScopedArray<Double>& result) { - result.reset(_is->read(p)); + _is->read(p, result); } bool |