From: Jonathan Wakely Date: Mon, 17 Oct 2016 17:03:40 +0000 (+0100) Subject: Remove redundant const qualifiers from string_view X-Git-Tag: releases/gcc-5.5.0~759 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=701f0bcee6f679f58734019886d05b85f4d4b28b;p=thirdparty%2Fgcc.git Remove redundant const qualifiers from string_view Backport from mainline: 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. From-SVN: r241268 --- diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index efe8181cb340..888b3708197c 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,11 @@ +2016-10-17 Jonathan Wakely + + Backport from mainline: + 2016-10-11 Jonathan Wakely + + * include/experimental/string_view (basic_string_view::_S_compare): + Remove redundant const from return type. + 2016-10-17 Jonathan Wakely Backport from mainline: diff --git a/libstdc++-v3/include/experimental/string_view b/libstdc++-v3/include/experimental/string_view index 5807345d44c5..9e7ca0452fdd 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()