diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2015-09-21 12:44:08 +0100 |
|---|---|---|
| committer | Jonathan Wakely <redi@gcc.gnu.org> | 2015-09-21 12:44:08 +0100 |
| commit | 561cfdec2537f0999ba708cf6c0bc0371bdd781b (patch) | |
| tree | 40da0b3bc12e59a0518cd1c1b746de4777831bb4 | |
| parent | 5e8edf67f8abf795451cd19847d2a082094738e5 (diff) | |
| download | gcc-561cfdec2537f0999ba708cf6c0bc0371bdd781b.zip gcc-561cfdec2537f0999ba708cf6c0bc0371bdd781b.tar.gz gcc-561cfdec2537f0999ba708cf6c0bc0371bdd781b.tar.bz2 | |
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
| -rw-r--r-- | libstdc++-v3/ChangeLog | 6 | ||||
| -rw-r--r-- | libstdc++-v3/include/bits/basic_string.h | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index e689d94..7d0200a 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 b5e7e36..c1689af 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 |