diff options
| author | Jonathan Wakely <jwakely@redhat.com> | 2015-01-06 13:13:36 +0000 |
|---|---|---|
| committer | Jonathan Wakely <redi@gcc.gnu.org> | 2015-01-06 13:13:36 +0000 |
| commit | 63f213610320ffb3279ca0425b5e7de8092fef53 (patch) | |
| tree | 031635670888bf8959e78e5f501395940a3493a7 | |
| parent | f423b58c5a93e43658c566a540312934bc63faca (diff) | |
| download | gcc-63f213610320ffb3279ca0425b5e7de8092fef53.zip gcc-63f213610320ffb3279ca0425b5e7de8092fef53.tar.gz gcc-63f213610320ffb3279ca0425b5e7de8092fef53.tar.bz2 | |
* config/abi/pre/gnu.ver: Fix version conflict for std::locale::name().
From-SVN: r219260
| -rw-r--r-- | libstdc++-v3/ChangeLog | 4 | ||||
| -rw-r--r-- | libstdc++-v3/config/abi/pre/gnu.ver | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index e3b44e2..ebd789c 100644 --- 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 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]*; |