diff options
author | Benoit Foucher <benoit@zeroc.com> | 2008-01-09 21:27:15 +0100 |
---|---|---|
committer | Benoit Foucher <benoit@zeroc.com> | 2008-01-09 21:27:15 +0100 |
commit | 5b2cdfebdd59ca3f99eb306e0ccf775fc0a81b83 (patch) | |
tree | 3414c09ed68bbbda6d446a76c552e065c9e91108 /cpp/src/Ice/BasicStream.cpp | |
parent | Added info on mcpp (diff) | |
download | ice-5b2cdfebdd59ca3f99eb306e0ccf775fc0a81b83.tar.bz2 ice-5b2cdfebdd59ca3f99eb306e0ccf775fc0a81b83.tar.xz ice-5b2cdfebdd59ca3f99eb306e0ccf775fc0a81b83.zip |
- Fixed bug 1619, part of 2632.
Diffstat (limited to 'cpp/src/Ice/BasicStream.cpp')
-rw-r--r-- | cpp/src/Ice/BasicStream.cpp | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/cpp/src/Ice/BasicStream.cpp b/cpp/src/Ice/BasicStream.cpp index e636c0d952d..6c710bd5ab5 100644 --- a/cpp/src/Ice/BasicStream.cpp +++ b/cpp/src/Ice/BasicStream.cpp @@ -291,18 +291,6 @@ IceInternal::BasicStream::ReadEncaps::swap(ReadEncaps& other) std::swap(previous, other.previous); } -void -IceInternal::BasicStream::checkReadEncaps() -{ - assert(_currentReadEncaps); - Container::size_type start = _currentReadEncaps->start; - Int sz = _currentReadEncaps->sz; - if(i != b.begin() + start + sz) - { - throw EncapsulationException(__FILE__, __LINE__); - } -} - Int IceInternal::BasicStream::getReadEncapsSize() { @@ -2017,6 +2005,12 @@ IceInternal::BasicStream::throwUnsupportedEncodingException(const char* file, in } void +IceInternal::BasicStream::throwEncapsulationException(const char* file, int line) +{ + throw EncapsulationException(file, line); +} + +void IceInternal::BasicStream::writeInstance(const ObjectPtr& v, Int index) { write(index); |