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

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@219260 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index e3b44e2529dfa29f91b24129667c065a319fd4a0..ebd789c219d88f877f2aab523f427f872eac2d0c 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,7 @@
+2015-01-06  Jonathan Wakely  <jwakely@redhat.com>
+
+       * config/abi/pre/gnu.ver: Fix version conflict for std::locale::name().
+
 2015-01-05  Jakub Jelinek  <jakub@redhat.com>
 
        Update copyright years.

diff --git a/libstdc++-v3/config/abi/pre/gnu.ver b/libstdc++-v3/config/abi/pre/gnu.ver
index e680e99b2d01459b04e26dbe00184cff575018e1..7bb65e950d16974ab35923c6cfa6c4680f5d0d9b 100644 (file)
--- 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]*;