locale_facets.tcc (num_get<>::do_get(void*&)): If the failbit is set, don't set it again.

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.

From-SVN: r90861

libstdc++-v3/ChangeLog

 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.

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