From 561cfdec2537f0999ba708cf6c0bc0371bdd781b Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Mon, 21 Sep 2015 12:44:08 +0100 Subject: [PATCH] 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 --- libstdc++-v3/ChangeLog | 6 ++++++ libstdc++-v3/include/bits/basic_string.h | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index e689d948859..7d0200ac1f4 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,9 @@ +2015-09-21 Jonathan Wakely + + 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 PR libstdc++/67361 diff --git a/libstdc++-v3/include/bits/basic_string.h b/libstdc++-v3/include/bits/basic_string.h index b5e7e3628c6..c1689af0e70 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 -- 2.30.2