diff options
Diffstat (limited to 'system/include/libcxx/locale')
| -rw-r--r-- | system/include/libcxx/locale | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/system/include/libcxx/locale b/system/include/libcxx/locale index 153038ee..e9a18e32 100644 --- a/system/include/libcxx/locale +++ b/system/include/libcxx/locale @@ -189,7 +189,7 @@ template <class charT> class messages_byname; #if _WIN32 #include <support/win32/support.h> // vasprintf #else // _WIN32 -// XXX Emscripten #include <nl_types.h> +#include <nl_types.h> #endif // !_WIN32 #pragma GCC system_header @@ -800,7 +800,6 @@ template <class _CharT, class _InputIterator> locale::id num_get<_CharT, _InputIterator>::id; -/* XXX Emscripten template <class _Tp> _Tp __num_get_signed_integral(const char* __a, const char* __a_end, @@ -1308,8 +1307,6 @@ num_get<_CharT, _InputIterator>::do_get(iter_type __b, iter_type __e, return __b; } -*/ - extern template class num_get<char>; extern template class num_get<wchar_t>; @@ -1392,7 +1389,7 @@ void __num_put<_CharT>::__widen_and_group_float(char* __nb, char* __np, char* __ne, _CharT* __ob, _CharT*& __op, _CharT*& __oe, const locale& __loc) -;/* XXX Emscripten { +{ const ctype<_CharT>& __ct = use_facet<ctype<_CharT> > (__loc); const numpunct<_CharT>& __npt = use_facet<numpunct<_CharT> >(__loc); string __grouping = __npt.grouping(); @@ -1467,7 +1464,6 @@ __num_put<_CharT>::__widen_and_group_float(char* __nb, char* __np, char* __ne, else __op = __ob + (__np - __nb); } -*/ extern template class __num_put<char>; extern template class __num_put<wchar_t>; @@ -3717,7 +3713,7 @@ template <class _CharT> typename messages<_CharT>::catalog messages<_CharT>::do_open(const basic_string<char>& __nm, const locale&) const { -#if defined(_WIN32) || defined(EMSCRIPTEN) +#if _WIN32 return -1; #else // _WIN32 catalog __cat = reinterpret_cast<catalog>(catopen(__nm.c_str(), NL_CAT_LOCALE)); @@ -3732,7 +3728,7 @@ typename messages<_CharT>::string_type messages<_CharT>::do_get(catalog __c, int __set, int __msgid, const string_type& __dflt) const { -#if defined(_WIN32) || defined(EMSCRIPTEN) +#if _WIN32 return __dflt; #else // _WIN32 string __ndflt; @@ -3754,7 +3750,7 @@ template <class _CharT> void messages<_CharT>::do_close(catalog __c) const { -#if !defined(_WIN32) && !defined(EMSCRIPTEN) +#if !_WIN32 if (__c != -1) __c <<= 1; nl_catd __cat = reinterpret_cast<nl_catd>(__c); |