diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2015-10-02 23:13:12 +0100 |
|---|---|---|
| committer | Jonathan Wakely <redi@gcc.gnu.org> | 2015-10-02 23:13:12 +0100 |
| commit | 783aa06e9b48413aa0c463c985cd921aafb1a06a (patch) | |
| tree | 1343af66caa4366228c528e8905f255a56dad91a | |
| parent | 38cccb0b7eeda1e3c086cbc299fecfa77b00ae30 (diff) | |
| download | gcc-783aa06e9b48413aa0c463c985cd921aafb1a06a.zip gcc-783aa06e9b48413aa0c463c985cd921aafb1a06a.tar.gz gcc-783aa06e9b48413aa0c463c985cd921aafb1a06a.tar.bz2 | |
Use noexcept instead of _GLIBCXX_NOEXCEPT
* include/bits/basic_string.h [!_GLIBCXX_USE_CXX11_ABI]
(basic_string::front() const, basic_string::back() const): Use
noexcept instead of _GLIBCXX_NOEXCEPT macro.
(__versa_string::front, __versa_string::back): Likewise.
From-SVN: r228434
| -rw-r--r-- | libstdc++-v3/ChangeLog | 5 | ||||
| -rw-r--r-- | libstdc++-v3/include/bits/basic_string.h | 4 | ||||
| -rw-r--r-- | libstdc++-v3/include/ext/vstring.h | 8 |
3 files changed, 11 insertions, 6 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index def1789..9633f61 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,10 @@ 2015-10-02 Jonathan Wakely <jwakely@redhat.com> + * include/bits/basic_string.h [!_GLIBCXX_USE_CXX11_ABI] + (basic_string::front() const, basic_string::back() const): Use + noexcept instead of _GLIBCXX_NOEXCEPT macro. + (__versa_string::front, __versa_string::back): Likewise. + * acinclude.m4 (GLIBCXX_ENABLE_DEBUG_FLAGS): Fix comment. * include/bits/locale_conv.h [!_GLIBCXX_USE_WCHAR_T] diff --git a/libstdc++-v3/include/bits/basic_string.h b/libstdc++-v3/include/bits/basic_string.h index c1689af..35246d9 100644 --- a/libstdc++-v3/include/bits/basic_string.h +++ b/libstdc++-v3/include/bits/basic_string.h @@ -3441,7 +3441,7 @@ _GLIBCXX_END_NAMESPACE_CXX11 * element of the %string. */ const_reference - front() const _GLIBCXX_NOEXCEPT + front() const noexcept { __glibcxx_assert(!empty()); return operator[](0); @@ -3463,7 +3463,7 @@ _GLIBCXX_END_NAMESPACE_CXX11 * last element of the %string. */ const_reference - back() const _GLIBCXX_NOEXCEPT + back() const noexcept { __glibcxx_assert(!empty()); return operator[](this->size() - 1); diff --git a/libstdc++-v3/include/ext/vstring.h b/libstdc++-v3/include/ext/vstring.h index 94af25e..68acd57 100644 --- a/libstdc++-v3/include/ext/vstring.h +++ b/libstdc++-v3/include/ext/vstring.h @@ -613,7 +613,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION * element of the %string. */ reference - front() _GLIBCXX_NOEXCEPT + front() noexcept { return operator[](0); } /** @@ -621,7 +621,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION * element of the %string. */ const_reference - front() const _GLIBCXX_NOEXCEPT + front() const noexcept { return operator[](0); } /** @@ -629,7 +629,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION * element of the %string. */ reference - back() _GLIBCXX_NOEXCEPT + back() noexcept { return operator[](this->size() - 1); } /** @@ -637,7 +637,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION * last element of the %string. */ const_reference - back() const _GLIBCXX_NOEXCEPT + back() const noexcept { return operator[](this->size() - 1); } #endif |