diff options
Diffstat (limited to 'libstdc++-v3/src/locale.cc')
| -rw-r--r-- | libstdc++-v3/src/locale.cc | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/libstdc++-v3/src/locale.cc b/libstdc++-v3/src/locale.cc index 7788a58419d..e10abee991c 100644 --- a/libstdc++-v3/src/locale.cc +++ b/libstdc++-v3/src/locale.cc @@ -55,7 +55,7 @@ namespace std const locale::category locale::all; // In the future, GLIBCXX_ABI > 5 should remove all uses of - // _GLIBCPP_ASM_SYMVER in this file, and remove exports of any + // _GLIBCXX_ASM_SYMVER in this file, and remove exports of any // static data members of locale. // These are no longer exported. @@ -72,7 +72,7 @@ namespace std { &std::ctype<char>::id, &codecvt<char, char, mbstate_t>::id, -#ifdef _GLIBCPP_USE_WCHAR_T +#ifdef _GLIBCXX_USE_WCHAR_T &std::ctype<wchar_t>::id, &codecvt<wchar_t, char, mbstate_t>::id, #endif @@ -85,7 +85,7 @@ namespace std &num_get<char>::id, &num_put<char>::id, &numpunct<char>::id, -#ifdef _GLIBCPP_USE_WCHAR_T +#ifdef _GLIBCXX_USE_WCHAR_T &num_get<wchar_t>::id, &num_put<wchar_t>::id, &numpunct<wchar_t>::id, @@ -97,7 +97,7 @@ namespace std locale::_Impl::_S_id_collate[] = { &std::collate<char>::id, -#ifdef _GLIBCPP_USE_WCHAR_T +#ifdef _GLIBCXX_USE_WCHAR_T &std::collate<wchar_t>::id, #endif 0 @@ -109,7 +109,7 @@ namespace std &__timepunct<char>::id, &time_get<char>::id, &time_put<char>::id, -#ifdef _GLIBCPP_USE_WCHAR_T +#ifdef _GLIBCXX_USE_WCHAR_T &__timepunct<wchar_t>::id, &time_get<wchar_t>::id, &time_put<wchar_t>::id, @@ -124,7 +124,7 @@ namespace std &money_put<char>::id, &moneypunct<char, false>::id, &moneypunct<char, true >::id, -#ifdef _GLIBCPP_USE_WCHAR_T +#ifdef _GLIBCXX_USE_WCHAR_T &money_get<wchar_t>::id, &money_put<wchar_t>::id, &moneypunct<wchar_t, false>::id, @@ -137,7 +137,7 @@ namespace std locale::_Impl::_S_id_messages[] = { &std::messages<char>::id, -#ifdef _GLIBCPP_USE_WCHAR_T +#ifdef _GLIBCXX_USE_WCHAR_T &std::messages<wchar_t>::id, #endif 0 @@ -425,7 +425,7 @@ namespace std case LC_TIME: __ret = time; break; -#ifdef _GLIBCPP_HAVE_LC_MESSAGES +#ifdef _GLIBCXX_HAVE_LC_MESSAGES case LC_MESSAGES: __ret = messages; break; @@ -464,7 +464,7 @@ namespace std return static_cast<const __numpunct_cache<char>&>(*__caches[__i]); } -#ifdef _GLIBCPP_USE_WCHAR_T +#ifdef _GLIBCXX_USE_WCHAR_T template<> const __numpunct_cache<wchar_t>& __use_cache(const locale& __loc) @@ -490,7 +490,7 @@ namespace std "IST", "EET", "CST", "JST" }; -#ifdef _GLIBCPP_USE_WCHAR_T +#ifdef _GLIBCXX_USE_WCHAR_T template<> const wchar_t* __timepunct<wchar_t>::_S_timezones[14] = @@ -507,7 +507,7 @@ namespace std const char* __num_base::_S_atoms_in = "0123456789eEabcdfABCDF"; const char* __num_base::_S_atoms_out ="-+xX0123456789abcdef0123456789ABCDEF"; - // _GLIBCPP_RESOLVE_LIB_DEFECTS + // _GLIBCXX_RESOLVE_LIB_DEFECTS // According to the resolution of DR 231, about 22.2.2.2.2, p11, // "str.precision() is specified in the conversion specification". void |