This is the mail archive of the libstdc++@gcc.gnu.org mailing list for the libstdc++ project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

Re: [patch] Only do shrink_to_fit() when exceptions enabled


Oops.

Bootstrapped with --disable-libstdcxx-dual-abi on x86_64-linux,
committed to trunk.

commit 9b9d9e3a5921f9a5225b466ce9d07b42b72f54dd
Author: Jonathan Wakely <jwakely@redhat.com>
Date:   Mon Sep 21 11:58:41 2015 +0100

    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.

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
 

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]