diff options
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/Ice/StringUtil.cpp | 1 | ||||
| -rw-r--r-- | cpp/src/IceStorm/TopicI.cpp | 2 | ||||
| -rw-r--r-- | cpp/src/IceStorm/TopicManagerI.cpp | 4 |
3 files changed, 3 insertions, 4 deletions
diff --git a/cpp/src/Ice/StringUtil.cpp b/cpp/src/Ice/StringUtil.cpp index 2603dfdea9e..0c3710cae4f 100644 --- a/cpp/src/Ice/StringUtil.cpp +++ b/cpp/src/Ice/StringUtil.cpp @@ -140,7 +140,6 @@ IceInternal::encodeString(const string& s, const string& special) bool IceInternal::decodeString(const string& s, string::size_type start, string::size_type end, string& result) { - assert(start >= 0); assert(end <= s.size()); assert(start <= end); diff --git a/cpp/src/IceStorm/TopicI.cpp b/cpp/src/IceStorm/TopicI.cpp index 7b8c7f16753..9fbaf13fe3e 100644 --- a/cpp/src/IceStorm/TopicI.cpp +++ b/cpp/src/IceStorm/TopicI.cpp @@ -581,7 +581,7 @@ TopicI::getLinkInfoSeq(const Ice::Current&) const throw Ice::ObjectNotExistException(__FILE__, __LINE__); } - TopicI* const This = const_cast<TopicI* const>(this); + TopicI* This = const_cast<TopicI*>(this); This->reap(); LinkInfoSeq seq; diff --git a/cpp/src/IceStorm/TopicManagerI.cpp b/cpp/src/IceStorm/TopicManagerI.cpp index 26f2d0f6a32..d883c9fc9d0 100644 --- a/cpp/src/IceStorm/TopicManagerI.cpp +++ b/cpp/src/IceStorm/TopicManagerI.cpp @@ -84,7 +84,7 @@ TopicManagerI::retrieve(const string& name, const Ice::Current&) const { IceUtil::Mutex::Lock sync(*this); - TopicManagerI* const This = const_cast<TopicManagerI* const>(this); + TopicManagerI* This = const_cast<TopicManagerI*>(this); This->reap(); if(_topicIMap.find(name) != _topicIMap.end()) @@ -125,7 +125,7 @@ TopicManagerI::retrieveAll(const Ice::Current&) const { IceUtil::Mutex::Lock sync(*this); - TopicManagerI* const This = const_cast<TopicManagerI* const>(this); + TopicManagerI* This = const_cast<TopicManagerI*>(this); This->reap(); TopicDict all; |