Re: [patch] New std::string implementation

[Jonathan Wakely]

On 06/01/15 13:29 +0100, Rainer Orth wrote:

Jonathan Wakely <jwak...@redhat.com> writes:

Drat, I even tried to avoid that conflict, but apparently I thought
the letter that comes after 'n' is 'n'!

Does this fix it?

--- a/libstdc++-v3/config/abi/pre/gnu.ver
+++ b/libstdc++-v3/config/abi/pre/gnu.ver
@@ -118,7 +118,7 @@ GLIBCXX_3.4 {
#     std::locale::name();
      std::locale::none*;
      std::locale::numeric*;
-      std::locale::[A-Zn-z]*;
+      std::locale::[A-Zo-z]*;
      std::locale::_[A-Ha-z]*;
      std::locale::_Impl::[A-Za-z]*;
#     std::locale::_Impl::_M_[A-Za-z]*;

it does indeed.

Thanks for checking it. Tested x86_64-linux and committed to trunk.



commit e25934d17d4bb1c06bd76e923569a00ad0e66a18
Author: Jonathan Wakely <jwak...@redhat.com>
Date:   Tue Jan 6 11:03:31 2015 +0000

    	* config/abi/pre/gnu.ver: Fix version conflict for std::locale::name().

diff --git a/libstdc++-v3/config/abi/pre/gnu.ver b/libstdc++-v3/config/abi/pre/gnu.ver
index e680e99..7bb65e9 100644
--- a/libstdc++-v3/config/abi/pre/gnu.ver
+++ b/libstdc++-v3/config/abi/pre/gnu.ver
@@ -118,7 +118,7 @@ GLIBCXX_3.4 {
 #     std::locale::name();
       std::locale::none*;
       std::locale::numeric*;
-      std::locale::[A-Zn-z]*;
+      std::locale::[A-Zo-z]*;
       std::locale::_[A-Ha-z]*;
       std::locale::_Impl::[A-Za-z]*;
 #     std::locale::_Impl::_M_[A-Za-z]*;