[libstdc++ patch] add missing qulifications in codecvt_specializations.h

[libstdc++ patch] add missing qulifications in codecvt_specializations.h

[Matthias Klose]

Ok for mainline and branch (after 3.1.1 release)?

2002-07-14  Matthias Klose  <doko@debian.org>

        * config/locale/ieee_1003.1-2001/codecvt_specializations.h:
        add some qualifications.


Index: config/locale/ieee_1003.1-2001/codecvt_specializations.h
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/config/locale/ieee_1003.1-2001/codecvt_specializations.h,v
retrieving revision 1.4
diff -u -r1.4 codecvt_specializations.h
--- config/locale/ieee_1003.1-2001/codecvt_specializations.h	26 May 2002 14:35:04 -0000	1.4
+++ config/locale/ieee_1003.1-2001/codecvt_specializations.h	14 Jul 2002 14:52:54 -0000
@@ -260,7 +260,7 @@
 	   extern_type* __to, extern_type* __to_end,
 	   extern_type*& __to_next) const
     {
-      result __ret = error;
+      result __ret = codecvt_base::error;
       if (__state._M_good())
 	{
 	  typedef state_type::__desc_type	__desc_type;
@@ -304,7 +304,7 @@
 	    {
 	      __from_next = reinterpret_cast<const intern_type*>(__cfrom);
 	      __to_next = reinterpret_cast<extern_type*>(__cto);
-	      __ret = ok;
+	      __ret = codecvt_base::ok;
 	    }
 	  else 
 	    {
@@ -312,10 +312,10 @@
 		{
 		  __from_next = reinterpret_cast<const intern_type*>(__cfrom);
 		  __to_next = reinterpret_cast<extern_type*>(__cto);
-		  __ret = partial;
+		  __ret = codecvt_base::partial;
 		}
 	      else
-		__ret = error;
+		__ret = codecvt_base::error;
 	    }
 	}
       return __ret; 
@@ -327,7 +327,7 @@
     do_unshift(state_type& __state, extern_type* __to, 
 	       extern_type* __to_end, extern_type*& __to_next) const
     {
-      result __ret = error;
+      result __ret = codecvt_base::error;
       if (__state._M_good())
 	{
 	  typedef state_type::__desc_type	__desc_type;
@@ -345,14 +345,14 @@
 	    {
 	      __to_next = reinterpret_cast<extern_type*>(__cto);
 	      if (__tlen == __tmultiple * (__to_end - __to))
-		__ret = noconv;
+		__ret = codecvt_base::noconv;
 	      else if (__tlen == 0)
-		__ret = ok;
+		__ret = codecvt_base::ok;
 	      else
-		__ret = partial;
+		__ret = codecvt_base::partial;
 	    }
 	  else 
-	    __ret = error;
+	    __ret = codecvt_base::error;
 	}
       return __ret; 
     }
@@ -365,7 +365,7 @@
 	  intern_type* __to, intern_type* __to_end, 
 	  intern_type*& __to_next) const
     { 
-      result __ret = error;
+      result __ret = codecvt_base::error;
       if (__state._M_good())
 	{
 	  typedef state_type::__desc_type	__desc_type;
@@ -410,7 +410,7 @@
 	    {
 	      __from_next = reinterpret_cast<const extern_type*>(__cfrom);
 	      __to_next = reinterpret_cast<intern_type*>(__cto);
-	      __ret = ok;
+	      __ret = codecvt_base::ok;
 	    }
 	  else 
 	    {
@@ -418,10 +418,10 @@
 		{
 		  __from_next = reinterpret_cast<const extern_type*>(__cfrom);
 		  __to_next = reinterpret_cast<intern_type*>(__cto);
-		  __ret = partial;
+		  __ret = codecvt_base::partial;
 		}
 	      else
-		__ret = error;
+		__ret = codecvt_base::error;
 	    }
 	}
       return __ret; 

Re: [libstdc++ patch] add missing qulifications in codecvt_specializations.h

[Phil Edwards]

On Sun, Jul 14, 2002 at 04:55:21PM +0200, Matthias Klose wrote:
> Ok for mainline and branch (after 3.1.1 release)?
> 
> 2002-07-14  Matthias Klose  <doko@debian.org>
> 
>         * config/locale/ieee_1003.1-2001/codecvt_specializations.h:
>         add some qualifications.

Odd.  We've had this discussion before,

    http://gcc.gnu.org/ml/gcc-patches/2001-08/msg00041.html

almost a full year ago.  It looks like the patch was approved but nobody
ever checked it in (I think Gaby and Matthias each thought the other was
working on it :-) ).  I can find no record in the changelogs, and this
current patch was obviously generated against mainline.

Benjamin's point about testcases still holds, I think, unless there have
been tests added since then.


Phil

-- 
If ye love wealth greater than liberty, the tranquility of servitude greater
than the animating contest for freedom, go home and leave us in peace.  We seek
not your counsel, nor your arms.  Crouch down and lick the hand that feeds you;
and may posterity forget that ye were our countrymen.            - Samuel Adams