diff options
| -rw-r--r-- | libstdc++-v3/ChangeLog | 4 | ||||
| -rw-r--r-- | libstdc++-v3/include/experimental/string_view | 2 | ||||
| -rw-r--r-- | libstdc++-v3/include/std/string_view | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 7743e09..70a6b1c 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,9 @@ 2016-10-11 Jonathan Wakely <jwakely@redhat.com> + * include/experimental/string_view (basic_string_view::_S_compare): + Remove redundant const from return type. + * include/std/string_view (basic_string_view:_S_compare): Likewise. + * include/bits/std_mutex.h (mutex::native_handle) (lock_guard(mutex_type&, adopt_lock_t) (unique_lock(mutex_type&, adopt_lock_t): Add noexcept. diff --git a/libstdc++-v3/include/experimental/string_view b/libstdc++-v3/include/experimental/string_view index 8cb8c1f..c1dfef0 100644 --- a/libstdc++-v3/include/experimental/string_view +++ b/libstdc++-v3/include/experimental/string_view @@ -420,7 +420,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION private: - static constexpr const int + static constexpr int _S_compare(size_type __n1, size_type __n2) noexcept { return difference_type{__n1 - __n2} > std::numeric_limits<int>::max() diff --git a/libstdc++-v3/include/std/string_view b/libstdc++-v3/include/std/string_view index 14bfcd0..b2d2a29 100644 --- a/libstdc++-v3/include/std/string_view +++ b/libstdc++-v3/include/std/string_view @@ -414,7 +414,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION private: - static constexpr const int + static constexpr int _S_compare(size_type __n1, size_type __n2) noexcept { return difference_type{__n1 - __n2} > std::numeric_limits<int>::max() |