From: redi <redi@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Fri, 2 Oct 2015 22:13:12 +0000 (+0000)
Subject: Use noexcept instead of _GLIBCXX_NOEXCEPT
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=03a9188340bc67e1465b9bacb21b59c5256adcd9;p=thirdparty%2Fgcc.git

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.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@228434 138bc75d-0d04-0410-961f-82ee72b054a4
---

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index def1789f4b6f..9633f61a21e9 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 c1689af0e705..35246d945aaf 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 94af25eb597b..68acd576528b 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