diff options
Diffstat (limited to 'libstdc++-v3/config/locale/generic')
7 files changed, 74 insertions, 74 deletions
diff --git a/libstdc++-v3/config/locale/generic/c_locale.h b/libstdc++-v3/config/locale/generic/c_locale.h index 794471e05b7..6a750de2d71 100644 --- a/libstdc++-v3/config/locale/generic/c_locale.h +++ b/libstdc++-v3/config/locale/generic/c_locale.h @@ -53,7 +53,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION // fall back to the unsafe vsprintf which, in general, can be dangerous // and should be avoided. inline int - __convert_from_v(const __c_locale&, char* __out, + __convert_from_v(const __c_locale&, char* __out, const int __size __attribute__((__unused__)), const char* __fmt, ...) { diff --git a/libstdc++-v3/config/locale/generic/codecvt_members.cc b/libstdc++-v3/config/locale/generic/codecvt_members.cc index 7afb007b54c..3204474e4a9 100644 --- a/libstdc++-v3/config/locale/generic/codecvt_members.cc +++ b/libstdc++-v3/config/locale/generic/codecvt_members.cc @@ -41,7 +41,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION #ifdef _GLIBCXX_USE_WCHAR_T codecvt_base::result codecvt<wchar_t, char, mbstate_t>:: - do_out(state_type& __state, const intern_type* __from, + do_out(state_type& __state, const intern_type* __from, const intern_type* __from_end, const intern_type*& __from_next, extern_type* __to, extern_type* __to_end, extern_type*& __to_next) const @@ -88,7 +88,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION __ret = partial; break; } - + memcpy(__to, __buf, __conv); __state = __tmp_state; __to += __conv; @@ -101,12 +101,12 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION __from_next = __from; __to_next = __to; - return __ret; + return __ret; } - + codecvt_base::result codecvt<wchar_t, char, mbstate_t>:: - do_in(state_type& __state, const extern_type* __from, + do_in(state_type& __state, const extern_type* __from, const extern_type* __from_end, const extern_type*& __from_next, intern_type* __to, intern_type* __to_end, intern_type*& __to_next) const @@ -153,10 +153,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION __from_next = __from; __to_next = __to; - return __ret; + return __ret; } - int + int codecvt<wchar_t, char, mbstate_t>:: do_encoding() const throw() { @@ -166,9 +166,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION if (MB_CUR_MAX == 1) __ret = 1; return __ret; - } + } - int + int codecvt<wchar_t, char, mbstate_t>:: do_max_length() const throw() { @@ -176,8 +176,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION int __ret = MB_CUR_MAX; return __ret; } - - int + + int codecvt<wchar_t, char, mbstate_t>:: do_length(state_type& __state, const extern_type* __from, const extern_type* __end, size_t __max) const @@ -211,7 +211,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION __max--; } - return __ret; + return __ret; } #endif diff --git a/libstdc++-v3/config/locale/generic/collate_members.cc b/libstdc++-v3/config/locale/generic/collate_members.cc index 59334c326d5..0d0d2472885 100644 --- a/libstdc++-v3/config/locale/generic/collate_members.cc +++ b/libstdc++-v3/config/locale/generic/collate_members.cc @@ -38,30 +38,30 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION // These are basically extensions to char_traits, and perhaps should // be put there instead of here. template<> - int - collate<char>::_M_compare(const char* __one, + int + collate<char>::_M_compare(const char* __one, const char* __two) const throw() - { + { int __cmp = strcoll(__one, __two); return (__cmp >> (8 * sizeof (int) - 2)) | (__cmp != 0); } - + template<> size_t - collate<char>::_M_transform(char* __to, const char* __from, + collate<char>::_M_transform(char* __to, const char* __from, size_t __n) const throw() { return strxfrm(__to, __from, __n); } #ifdef _GLIBCXX_USE_WCHAR_T template<> - int - collate<wchar_t>::_M_compare(const wchar_t* __one, + int + collate<wchar_t>::_M_compare(const wchar_t* __one, const wchar_t* __two) const throw() { int __cmp = wcscoll(__one, __two); return (__cmp >> (8 * sizeof (int) - 2)) | (__cmp != 0); } - + template<> size_t collate<wchar_t>::_M_transform(wchar_t* __to, const wchar_t* __from, diff --git a/libstdc++-v3/config/locale/generic/ctype_members.cc b/libstdc++-v3/config/locale/generic/ctype_members.cc index bcde5bafe83..8eadb4a333f 100644 --- a/libstdc++-v3/config/locale/generic/ctype_members.cc +++ b/libstdc++-v3/config/locale/generic/ctype_members.cc @@ -40,19 +40,19 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION // NB: The other ctype<char> specializations are in src/locale.cc and // various /config/os/* files. ctype_byname<char>::ctype_byname(const char* __s, size_t __refs) - : ctype<char>(0, false, __refs) - { + : ctype<char>(0, false, __refs) + { if (std::strcmp(__s, "C") != 0 && std::strcmp(__s, "POSIX") != 0) { this->_S_destroy_c_locale(this->_M_c_locale_ctype); - this->_S_create_c_locale(this->_M_c_locale_ctype, __s); + this->_S_create_c_locale(this->_M_c_locale_ctype, __s); } } ctype_byname<char>::~ctype_byname() { } -#ifdef _GLIBCXX_USE_WCHAR_T +#ifdef _GLIBCXX_USE_WCHAR_T ctype<wchar_t>::__wmask_type ctype<wchar_t>::_M_convert_to_wmask(const mask __m) const throw() { @@ -102,7 +102,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION } return __ret; }; - + wchar_t ctype<wchar_t>::do_toupper(wchar_t __c) const { return towupper(__c); } @@ -117,11 +117,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION } return __hi; } - + wchar_t ctype<wchar_t>::do_tolower(wchar_t __c) const { return towlower(__c); } - + const wchar_t* ctype<wchar_t>::do_tolower(wchar_t* __lo, const wchar_t* __hi) const { @@ -136,11 +136,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION bool ctype<wchar_t>:: do_is(mask __m, char_type __c) const - { + { bool __ret = false; // Generically, 15 (instead of 11) since we don't know the numerical // encoding of the various categories in /usr/include/ctype.h. - const size_t __bitmasksize = 15; + const size_t __bitmasksize = 15; for (size_t __bitcur = 0; __bitcur <= __bitmasksize; ++__bitcur) if (__m & _M_bit[__bitcur] && iswctype(__c, _M_wmask[__bitcur])) @@ -148,10 +148,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION __ret = true; break; } - return __ret; + return __ret; } - - const wchar_t* + + const wchar_t* ctype<wchar_t>:: do_is(const wchar_t* __lo, const wchar_t* __hi, mask* __vec) const { @@ -159,7 +159,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION { // Generically, 15 (instead of 11) since we don't know the numerical // encoding of the various categories in /usr/include/ctype.h. - const size_t __bitmasksize = 15; + const size_t __bitmasksize = 15; mask __m = 0; for (size_t __bitcur = 0; __bitcur <= __bitmasksize; ++__bitcur) if (iswctype(*__lo, _M_wmask[__bitcur])) @@ -168,8 +168,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION } return __hi; } - - const wchar_t* + + const wchar_t* ctype<wchar_t>:: do_scan_is(mask __m, const wchar_t* __lo, const wchar_t* __hi) const { @@ -191,8 +191,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ctype<wchar_t>:: do_widen(char __c) const { return _M_widen[static_cast<unsigned char>(__c)]; } - - const char* + + const char* ctype<wchar_t>:: do_widen(const char* __lo, const char* __hi, wchar_t* __dest) const { @@ -208,16 +208,16 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION char ctype<wchar_t>:: do_narrow(wchar_t __wc, char __dfault) const - { + { if (__wc >= 0 && __wc < 128 && _M_narrow_ok) return _M_narrow[__wc]; const int __c = wctob(__wc); - return (__c == EOF ? __dfault : static_cast<char>(__c)); + return (__c == EOF ? __dfault : static_cast<char>(__c)); } const wchar_t* ctype<wchar_t>:: - do_narrow(const wchar_t* __lo, const wchar_t* __hi, char __dfault, + do_narrow(const wchar_t* __lo, const wchar_t* __hi, char __dfault, char* __dest) const { if (_M_narrow_ok) @@ -265,10 +265,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION _M_widen[__i] = btowc(__i); for (size_t __i = 0; __i <= 15; ++__i) - { + { _M_bit[__i] = static_cast<mask>(1 << __i); _M_wmask[__i] = _M_convert_to_wmask(_M_bit[__i]); - } + } } #endif // _GLIBCXX_USE_WCHAR_T diff --git a/libstdc++-v3/config/locale/generic/messages_members.h b/libstdc++-v3/config/locale/generic/messages_members.h index 7a7b8688466..fe1d3df9642 100644 --- a/libstdc++-v3/config/locale/generic/messages_members.h +++ b/libstdc++-v3/config/locale/generic/messages_members.h @@ -44,13 +44,13 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION { _M_c_locale_messages = _S_get_c_locale(); } template<typename _CharT> - messages<_CharT>::messages(__c_locale, const char*, size_t __refs) + messages<_CharT>::messages(__c_locale, const char*, size_t __refs) : facet(__refs) { _M_c_locale_messages = _S_get_c_locale(); } template<typename _CharT> - typename messages<_CharT>::catalog - messages<_CharT>::open(const basic_string<char>& __s, const locale& __loc, + typename messages<_CharT>::catalog + messages<_CharT>::open(const basic_string<char>& __s, const locale& __loc, const char*) const { return this->do_open(__s, __loc); } @@ -60,31 +60,31 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION { _S_destroy_c_locale(_M_c_locale_messages); } template<typename _CharT> - typename messages<_CharT>::catalog + typename messages<_CharT>::catalog messages<_CharT>::do_open(const basic_string<char>&, const locale&) const { return 0; } template<typename _CharT> - typename messages<_CharT>::string_type - messages<_CharT>::do_get(catalog, int, int, + typename messages<_CharT>::string_type + messages<_CharT>::do_get(catalog, int, int, const string_type& __dfault) const { return __dfault; } template<typename _CharT> - void - messages<_CharT>::do_close(catalog) const + void + messages<_CharT>::do_close(catalog) const { } // messages_byname template<typename _CharT> messages_byname<_CharT>::messages_byname(const char* __s, size_t __refs) - : messages<_CharT>(__refs) - { + : messages<_CharT>(__refs) + { if (__builtin_strcmp(__s, "C") != 0 && __builtin_strcmp(__s, "POSIX") != 0) { this->_S_destroy_c_locale(this->_M_c_locale_messages); - this->_S_create_c_locale(this->_M_c_locale_messages, __s); + this->_S_create_c_locale(this->_M_c_locale_messages, __s); } } diff --git a/libstdc++-v3/config/locale/generic/numeric_members.cc b/libstdc++-v3/config/locale/generic/numeric_members.cc index 98a6e85a0c8..f45f7c2846a 100644 --- a/libstdc++-v3/config/locale/generic/numeric_members.cc +++ b/libstdc++-v3/config/locale/generic/numeric_members.cc @@ -34,7 +34,7 @@ namespace std _GLIBCXX_VISIBILITY(default) { _GLIBCXX_BEGIN_NAMESPACE_VERSION - template<> + template<> void numpunct<char>::_M_initialize_numpunct(__c_locale) { @@ -48,10 +48,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION _M_data->_M_decimal_point = '.'; _M_data->_M_thousands_sep = ','; - + for (size_t __i = 0; __i < __num_base::_S_oend; ++__i) _M_data->_M_atoms_out[__i] = __num_base::_S_atoms_out[__i]; - + for (size_t __i = 0; __i < __num_base::_S_iend; ++__i) _M_data->_M_atoms_in[__i] = __num_base::_S_atoms_in[__i]; @@ -61,12 +61,12 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION _M_data->_M_falsename_size = 5; } - template<> + template<> numpunct<char>::~numpunct() { delete _M_data; } - + #ifdef _GLIBCXX_USE_WCHAR_T - template<> + template<> void numpunct<wchar_t>::_M_initialize_numpunct(__c_locale) { @@ -77,15 +77,15 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION _M_data->_M_grouping = ""; _M_data->_M_grouping_size = 0; _M_data->_M_use_grouping = false; - + _M_data->_M_decimal_point = L'.'; _M_data->_M_thousands_sep = L','; - + // Use ctype::widen code without the facet... for (size_t __i = 0; __i < __num_base::_S_oend; ++__i) _M_data->_M_atoms_out[__i] = static_cast<wchar_t>(__num_base::_S_atoms_out[__i]); - + for (size_t __i = 0; __i < __num_base::_S_iend; ++__i) _M_data->_M_atoms_in[__i] = static_cast<wchar_t>(__num_base::_S_atoms_in[__i]); @@ -96,7 +96,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION _M_data->_M_falsename_size = 5; } - template<> + template<> numpunct<wchar_t>::~numpunct() { delete _M_data; } #endif diff --git a/libstdc++-v3/config/locale/generic/time_members.h b/libstdc++-v3/config/locale/generic/time_members.h index 0b219c1194f..1d626df5f0f 100644 --- a/libstdc++-v3/config/locale/generic/time_members.h +++ b/libstdc++-v3/config/locale/generic/time_members.h @@ -39,24 +39,24 @@ namespace std _GLIBCXX_VISIBILITY(default) _GLIBCXX_BEGIN_NAMESPACE_VERSION template<typename _CharT> - __timepunct<_CharT>::__timepunct(size_t __refs) + __timepunct<_CharT>::__timepunct(size_t __refs) : facet(__refs), _M_data(0) - { + { _M_name_timepunct = _S_get_c_name(); - _M_initialize_timepunct(); + _M_initialize_timepunct(); } template<typename _CharT> - __timepunct<_CharT>::__timepunct(__cache_type* __cache, size_t __refs) + __timepunct<_CharT>::__timepunct(__cache_type* __cache, size_t __refs) : facet(__refs), _M_data(__cache) - { + { _M_name_timepunct = _S_get_c_name(); - _M_initialize_timepunct(); + _M_initialize_timepunct(); } template<typename _CharT> - __timepunct<_CharT>::__timepunct(__c_locale __cloc, const char* __s, - size_t __refs) + __timepunct<_CharT>::__timepunct(__c_locale __cloc, const char* __s, + size_t __refs) : facet(__refs), _M_data(0) { if (__builtin_strcmp(__s, _S_get_c_name()) != 0) @@ -81,11 +81,11 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION template<typename _CharT> __timepunct<_CharT>::~__timepunct() - { + { if (_M_name_timepunct != _S_get_c_name()) delete [] _M_name_timepunct; delete _M_data; - _S_destroy_c_locale(_M_c_locale_timepunct); + _S_destroy_c_locale(_M_c_locale_timepunct); } _GLIBCXX_END_NAMESPACE_VERSION |