From 89a2fb90925e68fd4d3175040b930423a051c21c Mon Sep 17 00:00:00 2001 From: Paolo Carlini Date: Sun, 23 Nov 2003 13:03:59 +0000 Subject: [PATCH] locale_facets.tcc (_M_extract_float, [...]): Remove a wrong comment and simplify the corresponding code using... 2003-11-23 Paolo Carlini * include/bits/locale_facets.tcc (_M_extract_float, _M_extract_int): Remove a wrong comment and simplify the corresponding code using char_traits::find(). From-SVN: r73853 --- libstdc++-v3/ChangeLog | 6 ++++++ libstdc++-v3/include/bits/locale_facets.tcc | 6 ++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 19de20cc333..05e0d8fd8be 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,9 @@ +2003-11-23 Paolo Carlini + + * include/bits/locale_facets.tcc (_M_extract_float, + _M_extract_int): Remove a wrong comment and simplify + the corresponding code using char_traits::find(). + 2003-11-22 Paolo Carlini * config/locale/gnu/monetary_members.cc diff --git a/libstdc++-v3/include/bits/locale_facets.tcc b/libstdc++-v3/include/bits/locale_facets.tcc index 23acf985b6b..3b5c484fa7b 100644 --- a/libstdc++-v3/include/bits/locale_facets.tcc +++ b/libstdc++-v3/include/bits/locale_facets.tcc @@ -175,8 +175,7 @@ namespace std const char_type __c = *__beg; const char_type* __p = __traits_type::find(__lit + _S_izero, 10, __c); - // NB: strchr returns true for __c == 0x0 - if (__p && !__traits_type::eq(__c, char_type())) + if (__p) { // Try first for acceptable digit; record it if found. __xtrc += _S_atoms_in[__p - __lit]; @@ -352,8 +351,7 @@ namespace std const char_type __c = *__beg; const char_type* __p = __traits_type::find(__lit + _S_izero, __len, __c); - // NB: strchr returns true for __c == 0x0 - if (__p && !__traits_type::eq(__c, char_type())) + if (__p) { // Try first for acceptable digit; record it if found. __xtrc += _S_atoms_in[__p - __lit];