diff options
| author | Benjamin Kosnik <bkoz@redhat.com> | 2002-10-11 07:09:36 +0000 |
|---|---|---|
| committer | Benjamin Kosnik <bkoz@gcc.gnu.org> | 2002-10-11 07:09:36 +0000 |
| commit | a7817e1db2b3b314507787b957afce31a56e7d13 (patch) | |
| tree | cdd64cd7bca0a1f9bfb3360b37bc3c4b83167acc /libstdc++-v3/src/locale.cc | |
| parent | 349e9f4b0b9e34a4a7408064caf7d23e786073a5 (diff) | |
| download | gcc-a7817e1db2b3b314507787b957afce31a56e7d13.tar.gz | |
linker-map.gnu (GLIBCPP_3.2.1): Add.
2002-10-10 Benjamin Kosnik <bkoz@redhat.com>
* config/linker-map.gnu (GLIBCPP_3.2.1): Add.
(GLIBCPP_3.2): Don't export locale::_S_*.
* src/ios.cc: Move globals into __gnu_cxx. Make old exported
symbols match.
* src/locale.cc: Same.
* src/localename.cc: Same.
* src/globals.cc: Same.
From-SVN: r58042
Diffstat (limited to 'libstdc++-v3/src/locale.cc')
| -rw-r--r-- | libstdc++-v3/src/locale.cc | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/libstdc++-v3/src/locale.cc b/libstdc++-v3/src/locale.cc index d9c69313491..f858a327cd1 100644 --- a/libstdc++-v3/src/locale.cc +++ b/libstdc++-v3/src/locale.cc @@ -34,11 +34,16 @@ #include <locale> #include <bits/atomicity.h> -namespace std +namespace __gnu_cxx { // Defined in globals.cc. - extern locale c_locale; - extern locale::_Impl c_locale_impl; + extern std::locale c_locale; + extern std::locale::_Impl c_locale_impl; +} // namespace __gnu_cxx + +namespace std +{ + using namespace __gnu_cxx; // Definitions for static const data members of locale. const locale::category locale::none; @@ -50,9 +55,15 @@ namespace std const locale::category locale::messages; const locale::category locale::all; + // In the future, GLIBCXX_ABI > 5 should remove all asm directives + // in this file, and remove exports of any static data members of locale. locale::_Impl* locale::_S_classic; + locale::_Impl* locale::_S_global; + const size_t locale::_S_categories_size; + asm (".symver _ZNSt6locale18_S_categories_sizeE,_ZNSt6locale17_S_num_categoriesE@@GLIBCPP_3.2"); + const size_t locale::_S_extra_categories_size; // Definitions for static const data members of locale::id |