This is the mail archive of the
libstdc++@gcc.gnu.org
mailing list for the libstdc++ project.
Re: [patch] New std::string implementation
- From: Jonathan Wakely <jwakely at redhat dot com>
- To: Rainer Orth <ro at CeBiTec dot Uni-Bielefeld dot DE>
- Cc: libstdc++ at gcc dot gnu dot org, gcc-patches at gcc dot gnu dot org
- Date: Tue, 6 Jan 2015 13:13:41 +0000
- Subject: Re: [patch] New std::string implementation
- Authentication-results: sourceware.org; auth=none
- References: <20141114154330 dot GH5191 at redhat dot com> <20141128152448 dot GQ5191 at redhat dot com> <20141128165532 dot GR5191 at redhat dot com> <20141219182333 dot GE3134 at redhat dot com> <yddzj9wutgx dot fsf at lokon dot CeBiTec dot Uni-Bielefeld dot DE> <20150106110248 dot GB3134 at redhat dot com> <yddvbkkum7c dot fsf at lokon dot CeBiTec dot Uni-Bielefeld dot DE>
On 06/01/15 13:29 +0100, Rainer Orth wrote:
Jonathan Wakely <jwakely@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 <jwakely@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]*;