diff options
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/Ice/Outgoing.cpp | 2 | ||||
| -rw-r--r-- | cpp/src/Ice/StringUtil.cpp | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/cpp/src/Ice/Outgoing.cpp b/cpp/src/Ice/Outgoing.cpp index e886bc28627..88fee1df3c7 100644 --- a/cpp/src/Ice/Outgoing.cpp +++ b/cpp/src/Ice/Outgoing.cpp @@ -279,6 +279,7 @@ IceInternal::Outgoing::finished(BasicStream& is) default: { + ex = 0; // To keep the compiler from complaining. assert(false); break; } @@ -325,6 +326,7 @@ IceInternal::Outgoing::finished(BasicStream& is) default: { + ex = 0; // To keep the compiler from complaining. assert(false); break; } diff --git a/cpp/src/Ice/StringUtil.cpp b/cpp/src/Ice/StringUtil.cpp index 0f12ec742e8..08b55a223b5 100644 --- a/cpp/src/Ice/StringUtil.cpp +++ b/cpp/src/Ice/StringUtil.cpp @@ -140,9 +140,8 @@ IceInternal::encodeString(const string& s, const string& special) bool IceInternal::decodeString(const string& s, string::size_type start, string::size_type end, string& result) { - const string::size_type len = s.size(); assert(start >= 0); - assert(end <= len); + assert(end <= s.size()); assert(start <= end); while(start < end) |