summaryrefslogtreecommitdiff
path: root/cpp/src/Ice/BasicStream.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/src/Ice/BasicStream.cpp')
-rw-r--r--cpp/src/Ice/BasicStream.cpp8
1 files changed, 3 insertions, 5 deletions
diff --git a/cpp/src/Ice/BasicStream.cpp b/cpp/src/Ice/BasicStream.cpp
index e874ab1c618..4a020b5ff8a 100644
--- a/cpp/src/Ice/BasicStream.cpp
+++ b/cpp/src/Ice/BasicStream.cpp
@@ -620,8 +620,8 @@ IceInternal::BasicStream::write(const string& v)
int pos = b.size();
resize(pos + len);
copy(v.begin(), v.end(), b.begin() + pos);
-// Int sz = _encapsStack.back().stringsWritten.size();
-// _encapsStack.back().stringsWritten[v] = -(sz + 1);
+ Int sz = _encapsStack.back().stringsWritten.size();
+ _encapsStack.back().stringsWritten[v] = -(sz + 1);
}
}
}
@@ -649,8 +649,6 @@ IceInternal::BasicStream::read(string& v)
Int len;
read(len);
- assert(len >= 0);
-
if (len < 0)
{
if (static_cast<vector<string>::size_type>(-(len + 1)) >= _encapsStack.back().stringsRead.size())
@@ -675,7 +673,7 @@ IceInternal::BasicStream::read(string& v)
}
v.resize(len);
copy(begin, i, v.begin());
-// _encapsStack.back().stringsRead.push_back(v);
+ _encapsStack.back().stringsRead.push_back(v);
}
}
}