diff options
Diffstat (limited to 'contrib/libstdc++/src/codecvt.cc')
| -rw-r--r-- | contrib/libstdc++/src/codecvt.cc | 63 |
1 files changed, 32 insertions, 31 deletions
diff --git a/contrib/libstdc++/src/codecvt.cc b/contrib/libstdc++/src/codecvt.cc index bc5508a..2010593 100644 --- a/contrib/libstdc++/src/codecvt.cc +++ b/contrib/libstdc++/src/codecvt.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2000, 2002, 2003 Free Software Foundation, Inc. +// Copyright (C) 2000, 2002, 2004 Free Software Foundation, Inc. // // This file is part of the GNU ISO C++ Library. This library is free // software; you can redistribute it and/or modify it under the @@ -34,23 +34,30 @@ namespace std // Definitions for locale::id of standard facets that are specialized. locale::id codecvt<char, char, mbstate_t>::id; -#ifdef _GLIBCPP_USE_WCHAR_T +#ifdef _GLIBCXX_USE_WCHAR_T locale::id codecvt<wchar_t, char, mbstate_t>::id; #endif -#ifdef _GLIBCPP_USE___ENC_TRAITS +#ifdef _GLIBCXX_USE___ENC_TRAITS // Definitions for static const data members of __enc_traits. const int __enc_traits::_S_max_size; #endif codecvt<char, char, mbstate_t>:: codecvt(size_t __refs) - : __codecvt_abstract_base<char, char, mbstate_t>(__refs) + : __codecvt_abstract_base<char, char, mbstate_t>(__refs), + _M_c_locale_codecvt(_S_get_c_locale()) { } codecvt<char, char, mbstate_t>:: - ~codecvt() + codecvt(__c_locale __cloc, size_t __refs) + : __codecvt_abstract_base<char, char, mbstate_t>(__refs), + _M_c_locale_codecvt(_S_clone_c_locale(__cloc)) { } + + codecvt<char, char, mbstate_t>:: + ~codecvt() + { _S_destroy_c_locale(_M_c_locale_codecvt); } codecvt_base::result codecvt<char, char, mbstate_t>:: @@ -59,7 +66,7 @@ namespace std extern_type* __to, extern_type*, extern_type*& __to_next) const { - // _GLIBCPP_RESOLVE_LIB_DEFECTS + // _GLIBCXX_RESOLVE_LIB_DEFECTS // According to the resolution of DR19, "If returns noconv [...] // there are no changes to the values in [to, to_limit)." __from_next = __from; @@ -80,10 +87,9 @@ namespace std codecvt<char, char, mbstate_t>:: do_in(state_type&, const extern_type* __from, const extern_type*, const extern_type*& __from_next, - intern_type* __to, intern_type*, - intern_type*& __to_next) const + intern_type* __to, intern_type*, intern_type*& __to_next) const { - // _GLIBCPP_RESOLVE_LIB_DEFECTS + // _GLIBCXX_RESOLVE_LIB_DEFECTS // According to the resolution of DR19, "If returns noconv [...] // there are no changes to the values in [to, to_limit)." __from_next = __from; @@ -103,54 +109,49 @@ namespace std int codecvt<char, char, mbstate_t>:: - do_length (const state_type&, const extern_type* __from, + do_length (state_type&, const extern_type* __from, const extern_type* __end, size_t __max) const - { return min(__max, static_cast<size_t>(__end - __from)); } + { + size_t __d = static_cast<size_t>(__end - __from); + return std::min(__max, __d); + } int codecvt<char, char, mbstate_t>:: do_max_length() const throw() { return 1; } -#ifdef _GLIBCPP_USE_WCHAR_T +#ifdef _GLIBCXX_USE_WCHAR_T // codecvt<wchar_t, char, mbstate_t> required specialization codecvt<wchar_t, char, mbstate_t>:: codecvt(size_t __refs) - : __codecvt_abstract_base<wchar_t, char, mbstate_t>(__refs) + : __codecvt_abstract_base<wchar_t, char, mbstate_t>(__refs), + _M_c_locale_codecvt(_S_get_c_locale()) { } codecvt<wchar_t, char, mbstate_t>:: - ~codecvt() + codecvt(__c_locale __cloc, size_t __refs) + : __codecvt_abstract_base<wchar_t, char, mbstate_t>(__refs), + _M_c_locale_codecvt(_S_clone_c_locale(__cloc)) { } + + codecvt<wchar_t, char, mbstate_t>:: + ~codecvt() + { _S_destroy_c_locale(_M_c_locale_codecvt); } codecvt_base::result codecvt<wchar_t, char, mbstate_t>:: do_unshift(state_type&, extern_type* __to, extern_type*, extern_type*& __to_next) const { + // XXX Probably wrong for stateful encodings __to_next = __to; return noconv; } - int - codecvt<wchar_t, char, mbstate_t>:: - do_encoding() const throw() - { return sizeof(wchar_t); } - bool codecvt<wchar_t, char, mbstate_t>:: do_always_noconv() const throw() { return false; } - - int - codecvt<wchar_t, char, mbstate_t>:: - do_length(const state_type&, const extern_type* __from, - const extern_type* __end, size_t __max) const - { return min(__max, static_cast<size_t>(__end - __from)); } - - int - codecvt<wchar_t, char, mbstate_t>:: - do_max_length() const throw() - { return 1; } -#endif // _GLIBCPP_USE_WCHAR_T +#endif // _GLIBCXX_USE_WCHAR_T } // namespace std |
