diff options
Diffstat (limited to 'contrib/libstdc++/include')
-rw-r--r-- | contrib/libstdc++/include/debug/safe_iterator.tcc | 8 | ||||
-rw-r--r-- | contrib/libstdc++/include/ext/ropeimpl.h | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/contrib/libstdc++/include/debug/safe_iterator.tcc b/contrib/libstdc++/include/debug/safe_iterator.tcc index d23e90f..2293d5d 100644 --- a/contrib/libstdc++/include/debug/safe_iterator.tcc +++ b/contrib/libstdc++/include/debug/safe_iterator.tcc @@ -54,8 +54,8 @@ namespace __gnu_debug static_cast<const _Sequence*>(_M_sequence)->begin(); std::pair<difference_type, _Distance_precision> __dist = this->_M_get_distance(__begin, *this); - bool __ok = (__dist.second == __dp_exact && __dist.first >= -__n - || __dist.second != __dp_exact && __dist.first > 0); + bool __ok = ((__dist.second == __dp_exact && __dist.first >= -__n) + || (__dist.second != __dp_exact && __dist.first > 0)); return __ok; } else @@ -64,8 +64,8 @@ namespace __gnu_debug static_cast<const _Sequence*>(_M_sequence)->end(); std::pair<difference_type, _Distance_precision> __dist = this->_M_get_distance(*this, __end); - bool __ok = (__dist.second == __dp_exact && __dist.first >= __n - || __dist.second != __dp_exact && __dist.first > 0); + bool __ok = ((__dist.second == __dp_exact && __dist.first >= __n) + || (__dist.second != __dp_exact && __dist.first > 0)); return __ok; } } diff --git a/contrib/libstdc++/include/ext/ropeimpl.h b/contrib/libstdc++/include/ext/ropeimpl.h index 28c0b1f..44d1dd0 100644 --- a/contrib/libstdc++/include/ext/ropeimpl.h +++ b/contrib/libstdc++/include/ext/ropeimpl.h @@ -1143,7 +1143,7 @@ _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) } else { - char* __kind; + const char* __kind; switch (__r->_M_tag) { |