From 7571121f10551b47b0eff7f8dc7fb32ed348f442 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Tue, 11 Oct 2016 11:33:24 +0100 Subject: [PATCH] Remove redundant const qualifliers from string_view * 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. From-SVN: r240981 --- libstdc++-v3/ChangeLog | 4 ++++ libstdc++-v3/include/experimental/string_view | 2 +- 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 7743e09cc46..70a6b1c7be6 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,9 @@ 2016-10-11 Jonathan Wakely + * 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 8cb8c1ffa1c..c1dfef0e3bf 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::max() diff --git a/libstdc++-v3/include/std/string_view b/libstdc++-v3/include/std/string_view index 14bfcd06e00..b2d2a296ba4 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::max() -- 2.30.2