Commit db5eed18 by Benjamin Kosnik Committed by Benjamin Kosnik

pod_char_traits.h: Add state template argument.


2003-07-16  Benjamin Kosnik  <bkoz@redhat.com>

	* include/ext/pod_char_traits.h: Add state template argument.

From-SVN: r69492
parent 7942afdc
2003-07-16 Benjamin Kosnik <bkoz@redhat.com> 2003-07-16 Benjamin Kosnik <bkoz@redhat.com>
* include/ext/pod_char_traits.h: Add state template argument.
2003-07-16 Benjamin Kosnik <bkoz@redhat.com>
* include/bits/locale_facets.h (__num_base::_S_atoms_in): Add -+xX. * include/bits/locale_facets.h (__num_base::_S_atoms_in): Add -+xX.
(num_get::_M_convert_int): To _M_insert_int. (num_get::_M_convert_int): To _M_insert_int.
(num_get::_M_convert_float): To _M_insert_float. (num_get::_M_convert_float): To _M_insert_float.
......
...@@ -37,11 +37,12 @@ ...@@ -37,11 +37,12 @@
namespace __gnu_cxx namespace __gnu_cxx
{ {
template<typename V, typename I> template<typename V, typename I, typename S = mbstate_t>
struct character struct character
{ {
typedef V value_type; typedef V value_type;
typedef I int_type; typedef I int_type;
typedef S state_type;
value_type value; value_type value;
}; };
...@@ -59,19 +60,18 @@ namespace __gnu_cxx ...@@ -59,19 +60,18 @@ namespace __gnu_cxx
namespace std namespace std
{ {
// Provide std::char_traits specialization. // Provide std::char_traits specialization.
template<typename V, typename I> template<typename V, typename I, typename S>
struct char_traits<__gnu_cxx::character<V, I> > struct char_traits<__gnu_cxx::character<V, I, S> >
{ {
typedef __gnu_cxx::character<V, I> char_type; typedef __gnu_cxx::character<V, I, S> char_type;
// NB: This type should be bigger than char_type, so as to // NB: This type should be bigger than char_type, so as to
// properly hold EOF values in addition to the full range of // properly hold EOF values in addition to the full range of
// char_type values. // char_type values.
typedef typename char_type::int_type int_type; typedef typename char_type::int_type int_type;
typedef typename char_type::state_type state_type;
typedef streampos pos_type; typedef streampos pos_type;
typedef streamoff off_type; typedef streamoff off_type;
typedef mbstate_t state_type;
static void static void
assign(char_type& __c1, const char_type& __c2) assign(char_type& __c1, const char_type& __c2)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment