From 63f213610320ffb3279ca0425b5e7de8092fef53 Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Tue, 6 Jan 2015 13:13:36 +0000 Subject: [PATCH] * config/abi/pre/gnu.ver: Fix version conflict for std::locale::name(). From-SVN: r219260 --- libstdc++-v3/ChangeLog | 4 ++++ libstdc++-v3/config/abi/pre/gnu.ver | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index e3b44e2529d..ebd789c219d 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,7 @@ +2015-01-06 Jonathan Wakely + + * config/abi/pre/gnu.ver: Fix version conflict for std::locale::name(). + 2015-01-05 Jakub Jelinek Update copyright years. diff --git a/libstdc++-v3/config/abi/pre/gnu.ver b/libstdc++-v3/config/abi/pre/gnu.ver index e680e99b2d0..7bb65e950d1 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]*; -- 2.30.2