From 6d4925e368e2d16f276317788fa797ed43b74cfe Mon Sep 17 00:00:00 2001 From: Paolo Carlini Date: Tue, 17 Feb 2004 11:19:25 +0000 Subject: [PATCH] locale_facets.tcc (num_get<>::_M_extract_float, [...]): Simplify grouping fidelity conditional. 2004-02-17 Paolo Carlini * 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 --- libstdc++-v3/ChangeLog | 6 ++++++ libstdc++-v3/include/bits/locale_facets.tcc | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 60acfdd589c6..74e3d4f38083 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,9 @@ +2004-02-17 Paolo Carlini + + * 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 * 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 5e6128e0934b..19d4d4a364f9 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(__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) -- 2.47.2