re PR libstdc++/10167 (ieee_1003.1-[3.2/3.3 regression] 2001 locale specialisations...

2003-03-26  Paolo Carlini  <pcarlini@unitus.it>

	PR libstdc++/10167
	* config/locale/ieee_1003.1-2001/codecvt_specializations.h
	(do_out, do_unshift, do_in): qualify 'ok', 'error', 'partial',
	'noconv' with codecvt_base::.

From-SVN: r64892

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index fca2be5f010b4e19def5c0623b35f582586eefad..e4f2688c258e34485e24a7d016afe3c63dd3a6c1 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,10 @@
+2003-03-26  Paolo Carlini  <pcarlini@unitus.it>
+
+       PR libstdc++/10167
+       * config/locale/ieee_1003.1-2001/codecvt_specializations.h
+       (do_out, do_unshift, do_in): qualify 'ok', 'error', 'partial',
+       'noconv' with codecvt_base::.
+
 2003-03-22  Loren J. Rittle  <ljrittle@acm.org>
 
        * config/os/hpux/bits/ctype_noninline.h (ctype<char>::classic_table):

diff --git a/libstdc++-v3/config/locale/ieee_1003.1-2001/codecvt_specializations.h b/libstdc++-v3/config/locale/ieee_1003.1-2001/codecvt_specializations.h
index a7d56ae33af0d5a2eef85e10689307fe3ee950f5..0cbfb2a3d6d7813f9dd1765119aeb97ced146166 100644 (file)
--- a/libstdc++-v3/config/locale/ieee_1003.1-2001/codecvt_specializations.h
+++ b/libstdc++-v3/config/locale/ieee_1003.1-2001/codecvt_specializations.h
@@ -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;