summaryrefslogtreecommitdiff
path: root/cpp/src/Ice/BasicStream.cpp
diff options
context:
space:
mode:
authorMarc Laukien <marc@zeroc.com>2003-02-06 20:39:02 +0000
committerMarc Laukien <marc@zeroc.com>2003-02-06 20:39:02 +0000
commit8c47a19fe0a38c6c9a6e97b7859df7f9b5a8b6fb (patch)
tree8fd580420dad30c88fc38c5e8940b9e68ffed297 /cpp/src/Ice/BasicStream.cpp
parentdo not use Ice version in service shared library name (diff)
downloadice-8c47a19fe0a38c6c9a6e97b7859df7f9b5a8b6fb.tar.bz2
ice-8c47a19fe0a38c6c9a6e97b7859df7f9b5a8b6fb.tar.xz
ice-8c47a19fe0a38c6c9a6e97b7859df7f9b5a8b6fb.zip
encaps fixes
Diffstat (limited to 'cpp/src/Ice/BasicStream.cpp')
-rw-r--r--cpp/src/Ice/BasicStream.cpp15
1 files changed, 15 insertions, 0 deletions
diff --git a/cpp/src/Ice/BasicStream.cpp b/cpp/src/Ice/BasicStream.cpp
index 305a43d33a5..d564ab96994 100644
--- a/cpp/src/Ice/BasicStream.cpp
+++ b/cpp/src/Ice/BasicStream.cpp
@@ -141,6 +141,21 @@ IceInternal::BasicStream::startReadEncaps()
void
IceInternal::BasicStream::endReadEncaps()
{
+ checkReadEncaps();
+ _readEncapsStack.pop_back();
+ if(_readEncapsStack.empty())
+ {
+ _currentReadEncaps = 0;
+ }
+ else
+ {
+ _currentReadEncaps = &_readEncapsStack.back();
+ }
+}
+
+void
+IceInternal::BasicStream::skipReadEncaps()
+{
assert(_currentReadEncaps);
int start = _currentReadEncaps->start;
_readEncapsStack.pop_back();