From: Benjamin Kosnik <bkoz@redhat.com>
Date: Thu, 17 Jul 2003 04:01:28 +0000 (+0000)
Subject: pod_char_traits.h: Add state template argument.
X-Git-Tag: releases/gcc-3.4.0~4786
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=db5eed1873ad17205d6cf4ac15ca84f4822b5381;p=thirdparty%2Fgcc.git

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
---

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 6510aa0f7b09..cf0e5e3a1959 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,7 @@
+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.
diff --git a/libstdc++-v3/include/ext/pod_char_traits.h b/libstdc++-v3/include/ext/pod_char_traits.h
index 0145a4830957..04bc0ddb52bb 100644
--- a/libstdc++-v3/include/ext/pod_char_traits.h
+++ b/libstdc++-v3/include/ext/pod_char_traits.h
@@ -37,11 +37,12 @@
 
 namespace __gnu_cxx
 {
-  template<typename V, typename I>
+  template<typename V, typename I, typename S = mbstate_t>
     struct character
     {
       typedef V 	value_type;
       typedef I 	int_type;
+      typedef S 	state_type;
       value_type 	value;
     };
   
@@ -59,19 +60,18 @@ namespace __gnu_cxx
 namespace std
 {
   // Provide std::char_traits specialization.
-  template<typename V, typename I>
-    struct char_traits<__gnu_cxx::character<V, I> >
+  template<typename V, typename I, typename S>
+    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
       // properly hold EOF values in addition to the full range of
       // char_type values.
       typedef typename char_type::int_type	int_type;
-
+      typedef typename char_type::state_type	state_type;
       typedef streampos 			pos_type;
       typedef streamoff 			off_type;
-      typedef mbstate_t 			state_type;
       
       static void 
       assign(char_type& __c1, const char_type& __c2)