locale_facets.tcc (num_get<>::_M_extract_float, [...]): Simplify grouping fidelity...

2004-02-17  Paolo Carlini  <pcarlini@suse.de>

	* include/bits/locale_facets.tcc (num_get<>::_M_extract_float,
	num_get<>::_M_extract_int, money_get<>::do_get): Simplify
	grouping fidelity conditional.

From-SVN: r77948

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 60acfdd589c6be19ed8ce28771e58b84138906e1..74e3d4f38083b5875d8729ed2d4eed8d5fc75c6f 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,9 @@
+2004-02-17  Paolo Carlini  <pcarlini@suse.de>
+
+       * include/bits/locale_facets.tcc (num_get<>::_M_extract_float,
+       num_get<>::_M_extract_int, money_get<>::do_get): Simplify
+       grouping fidelity conditional.
+
 2004-02-16  Paolo Carlini  <pcarlini@suse.de>
 
        * testsuite/27_io/basic_filebuf/overflow/char/13858.cc:

diff --git a/libstdc++-v3/include/bits/locale_facets.tcc b/libstdc++-v3/include/bits/locale_facets.tcc
index 5e6128e0934b958ed5ba2ec6eb89cf8a9da07e96..19d4d4a364f98ad51a6faaed6f1869302043af65 100644 (file)
--- a/libstdc++-v3/include/bits/locale_facets.tcc
+++ b/libstdc++-v3/include/bits/locale_facets.tcc
@@ -299,7 +299,7 @@ namespace std
 
       // Digit grouping is checked. If grouping and found_grouping don't
       // match, then get very very upset, and set failbit.
-      if (__lc->_M_use_grouping && __found_grouping.size())
+      if (__found_grouping.size())
         {
           // Add the ending grouping if a decimal wasn't found.
          if (!__found_dec)
@@ -492,7 +492,7 @@ namespace std
 
        // Digit grouping is checked. If grouping and found_grouping don't
        // match, then get very very upset, and set failbit.
-       if (__lc->_M_use_grouping && __found_grouping.size())
+       if (__found_grouping.size())
          {
            // Add the ending grouping.
            __found_grouping += static_cast<char>(__sep_pos);
@@ -1320,7 +1320,7 @@ namespace std
            __tmp_units.insert(__tmp_units.begin(), __ctype.widen('-'));
 
          // Test for grouping fidelity.
-         if (__grouping.size() && __grouping_tmp.size())
+         if (__grouping_tmp.size())
            {
              // Add the ending grouping if a decimal wasn't found.
              if (!__testdecfound)