diff options
| author | dim <dim@FreeBSD.org> | 2012-10-23 18:45:32 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2012-10-23 18:45:32 +0000 |
| commit | 99da76dc3d08b3012a3cf73037a072d9467d541f (patch) | |
| tree | 226d9f42be774a1f218b861d3d044261e31f78a6 /contrib/libstdc++/include | |
| parent | e1bc3b4134d3444ad6395eda2a2cf360b58be705 (diff) | |
| download | FreeBSD-src-99da76dc3d08b3012a3cf73037a072d9467d541f.zip FreeBSD-src-99da76dc3d08b3012a3cf73037a072d9467d541f.tar.gz | |
Fix a number of other clang warnings in libstdc++, which could appear
when building other C++ software with it. Also fix one actual bug in
libsupc++, which was exposed by such a warning. This latter fix is the
only functional change.
MFC after: 1 week
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) { |
