From b19fb27d1e08dc9e666289b35984ffd2ba052e86 Mon Sep 17 00:00:00 2001 From: Paolo Carlini Date: Mon, 1 Mar 2004 17:08:45 +0000 Subject: [PATCH] locale_facets.tcc (money_get<>::_M_extract): Fix thinkos in the switch from string_type& to string& as last argument. 2004-03-01 Paolo Carlini * include/bits/locale_facets.tcc (money_get<>::_M_extract): Fix thinkos in the switch from string_type& to string& as last argument. From-SVN: r78707 --- 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 251c5e00b623..1a7828c3e965 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,9 @@ +2004-03-01 Paolo Carlini + + * include/bits/locale_facets.tcc (money_get<>::_M_extract): + Fix thinkos in the switch from string_type& to string& as last + argument. + 2004-03-01 Paolo Carlini * include/bits/locale_facets.tcc (num_get<>::_M_extract_float): diff --git a/libstdc++-v3/include/bits/locale_facets.tcc b/libstdc++-v3/include/bits/locale_facets.tcc index 9fb234b03b21..399b5adc2852 100644 --- a/libstdc++-v3/include/bits/locale_facets.tcc +++ b/libstdc++-v3/include/bits/locale_facets.tcc @@ -1338,15 +1338,15 @@ namespace std // Strip leading zeros. if (__res.size() > 1) { - size_type __first = __res.find_first_not_of(__lit[_S_zero]); + const size_type __first = __res.find_first_not_of('0'); const bool __only_zeros = __first == string_type::npos; if (__first) __res.erase(0, __only_zeros ? __res.size() - 1 : __first); } // 22.2.6.1.2, p4 - if (__negative && __res[0] != __lit[_S_zero]) - __res.insert(__res.begin(), __lit[_S_minus]); + if (__negative && __res[0] != '0') + __res.insert(__res.begin(), '-'); // Test for grouping fidelity. if (__grouping_tmp.size()) -- 2.47.2