From: Jonathan Wakely <jwakely@redhat.com>
Date: Mon, 21 Sep 2015 11:44:08 +0000 (+0100)
Subject: Fix bootstrap error introduced in r227870
X-Git-Tag: basepoints/gcc-7~4452
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=561cfdec2537f0999ba708cf6c0bc0371bdd781b;p=thirdparty%2Fgcc.git

Fix bootstrap error introduced in r227870

	PR libstdc++/67647
	* include/bits/basic_string.h [!_GLIBCXX_USE_CXX11_ABI]
	(basic_string::shrink_to_fit): Fix #endif placement.

From-SVN: r227966
---

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index e689d948859c..7d0200ac1f4d 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,9 @@
+2015-09-21  Jonathan Wakely  <jwakely@redhat.com>
+
+	PR libstdc++/67647
+	* include/bits/basic_string.h [!_GLIBCXX_USE_CXX11_ABI]
+	(basic_string::shrink_to_fit): Fix #endif placement.
+
 2015-09-19  Tim Shen  <timshen@google.com>
 
 	PR libstdc++/67361
diff --git a/libstdc++-v3/include/bits/basic_string.h b/libstdc++-v3/include/bits/basic_string.h
index b5e7e3628c62..c1689af0e705 100644
--- a/libstdc++-v3/include/bits/basic_string.h
+++ b/libstdc++-v3/include/bits/basic_string.h
@@ -3291,8 +3291,8 @@ _GLIBCXX_END_NAMESPACE_CXX11
 	      { reserve(0); }
 	    catch(...)
 	      { }
-#endif
 	  }
+#endif
       }
 #endif