aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaolo Carlini <pcarlini@suse.de>2004-02-17 11:19:25 +0000
committerPaolo Carlini <paolo@gcc.gnu.org>2004-02-17 11:19:25 +0000
commit6d4925e368e2d16f276317788fa797ed43b74cfe (patch)
treee3a3c964c2889de29a1646f465aa2c98ed6c20e7
parentfd1146d48f8592e8a52eeb5a5dc09212de5cffec (diff)
downloadgcc-6d4925e368e2d16f276317788fa797ed43b74cfe.zip
gcc-6d4925e368e2d16f276317788fa797ed43b74cfe.tar.gz
gcc-6d4925e368e2d16f276317788fa797ed43b74cfe.tar.bz2
locale_facets.tcc (num_get<>::_M_extract_float, [...]): Simplify grouping fidelity conditional.
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
-rw-r--r--libstdc++-v3/ChangeLog6
-rw-r--r--libstdc++-v3/include/bits/locale_facets.tcc6
2 files changed, 9 insertions, 3 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 60acfdd..74e3d4f 100644
--- 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 5e6128e..19d4d4a 100644
--- 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)