From 5c173b51ab75216d9eaba37add2f476bc8e7b3ad Mon Sep 17 00:00:00 2001 From: paolo Date: Sat, 25 Oct 2003 09:28:39 +0000 Subject: [PATCH] 2003-10-25 Paolo Carlini * include/bits/locale_facets.tcc (num_get::_M_extract_int): __pos in only incremented, never used its value, remove it. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@72922 138bc75d-0d04-0410-961f-82ee72b054a4 --- libstdc++-v3/ChangeLog | 5 +++++ libstdc++-v3/include/bits/locale_facets.tcc | 7 ------- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 41d4109880e..387d20259ff 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,8 @@ +2003-10-25 Paolo Carlini + + * include/bits/locale_facets.tcc (num_get::_M_extract_int): + __pos in only incremented, never used its value, remove it. + 2003-10-24 Robert Millan * acinclude.m4 (GLIBCXX_ENABLE_CLOCALE): Add kfreebsd*-gnu diff --git a/libstdc++-v3/include/bits/locale_facets.tcc b/libstdc++-v3/include/bits/locale_facets.tcc index 94d41a545c4..0c323dd3471 100644 --- a/libstdc++-v3/include/bits/locale_facets.tcc +++ b/libstdc++-v3/include/bits/locale_facets.tcc @@ -288,14 +288,12 @@ namespace std __base = 10; // First check for sign. - int __pos = 0; char_type __c = *__beg; const bool __plus = __traits_type::eq(__c, __lit[_S_iplus]); if ((__plus || __traits_type::eq(__c, __lit[_S_iminus])) && __beg != __end) { __xtrc += __plus ? _S_atoms_in[_S_iplus] : _S_atoms_in[_S_iminus]; - ++__pos; __c = *(++__beg); } @@ -311,7 +309,6 @@ namespace std if (__found_zero) { __xtrc += _S_atoms_in[_S_izero]; - ++__pos; if (__basefield == 0) { const bool __x = __traits_type::eq(__c, __lit[_S_ix]); @@ -319,7 +316,6 @@ namespace std && __beg != __end) { __xtrc += __x ? _S_atoms_in[_S_ix] : _S_atoms_in[_S_iX]; - ++__pos; __c = *(++__beg); __base = 16; } @@ -333,7 +329,6 @@ namespace std if (__traits_type::eq(__c, __lit[_S_izero]) && __beg != __end) { __xtrc += _S_atoms_in[_S_izero]; - ++__pos; __c = *(++__beg); const bool __x = __traits_type::eq(__c, __lit[_S_ix]); @@ -341,7 +336,6 @@ namespace std && __beg != __end) { __xtrc += __x ? _S_atoms_in[_S_ix] : _S_atoms_in[_S_iX]; - ++__pos; __c = *(++__beg); } } @@ -365,7 +359,6 @@ namespace std { // Try first for acceptable digit; record it if found. __xtrc += _S_atoms_in[__p - __lit]; - ++__pos; ++__sep_pos; __c = *(++__beg); } -- 2.11.0