2004-11-18 Paolo Carlini <pcarlini@suse.de>

	* include/bits/locale_facets.tcc (num_get<>::do_get(void*&)):
	If the failbit is set, don't set it again.
	(money_get<>::_M_extract): Minor stylistic tweak: consistently
	with the other functions, take care of eofbit at the end.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@90861 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 370044a..09e20fc 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,5 +1,12 @@
 2004-11-18  Paolo Carlini  <pcarlini@suse.de>
 
+       * include/bits/locale_facets.tcc (num_get<>::do_get(void*&)):
+       If the failbit is set, don't set it again.
+       (money_get<>::_M_extract): Minor stylistic tweak: consistently
+       with the other functions, take care of eofbit at the end.
+
+2004-11-18  Paolo Carlini  <pcarlini@suse.de>
+
        DR 434. bitset::to_string() hard to use [Ready]
        * include/std/std_bitset.h (to_string): Add three overloads, taking
        fewer template arguments.

diff --git a/libstdc++-v3/include/bits/locale_facets.tcc b/libstdc++-v3/include/bits/locale_facets.tcc
index 8216978..b503c95 100644 (file)
--- a/libstdc++-v3/include/bits/locale_facets.tcc
+++ b/libstdc++-v3/include/bits/locale_facets.tcc
@@ -825,8 +825,6 @@ namespace std
 
       if (!(__err & ios_base::failbit))
        __v = reinterpret_cast<void*>(__ul);
-      else
-       __err |= ios_base::failbit;
       return __beg;
     }
 
@@ -1481,16 +1479,15 @@ namespace std
              __testvalid = false;
          }
        
-       // Iff no more characters are available.
-       if (__beg == __end)
-         __err |= ios_base::eofbit;
-       
        // Iff valid sequence is not recognized.
        if (!__testvalid)
          __err |= ios_base::failbit;
        else
          __units.swap(__res);
        
+       // Iff no more characters are available.
+       if (__beg == __end)
+         __err |= ios_base::eofbit;
        return __beg;
       }