diff options
| author | jason <jason@138bc75d-0d04-0410-961f-82ee72b054a4> | 2001-12-11 15:48:11 +0000 |
|---|---|---|
| committer | jason <jason@138bc75d-0d04-0410-961f-82ee72b054a4> | 2001-12-11 15:48:11 +0000 |
| commit | f73d06aff94a3a150826549347ae562e7b0be1bd (patch) | |
| tree | 88d7999f243355ed50d3eccbd18e7a13d0a24c01 /libstdc++-v3 | |
| parent | bf8e3599fc4ef9122d34cf17edcaaa487fafbf8c (diff) | |
| download | gcc-f73d06aff94a3a150826549347ae562e7b0be1bd.tar.gz | |
* include/bits/locale_facets.tcc (_M_extract_int): Avoid
uninitialized warning.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@47877 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3')
| -rw-r--r-- | libstdc++-v3/ChangeLog | 6 | ||||
| -rw-r--r-- | libstdc++-v3/include/bits/locale_facets.tcc | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 81929d9c83a..89d1bec5f05 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,8 @@ +2001-12-11 Jason Merrill <jason@redhat.com> + + * include/bits/locale_facets.tcc (_M_extract_int): Avoid + uninitialized warning. + 2001-12-11 Loren Rittle <ljrittle@acm.org> * config/cpu/sparc/sparc32/bits/atomicity.h @@ -22,6 +27,7 @@ * include/bits/locale_facets.h (__num_base::_S_scale_hex): Add. (__num_base::_S_scale_oct): Add. + * include/bits/locale_facets.tcc (_M_extract_int): Use them. * src/locale.cc: Add definitions. * testsuite/27_io/istream_extractor_arith.cc (main): Call test13. diff --git a/libstdc++-v3/include/bits/locale_facets.tcc b/libstdc++-v3/include/bits/locale_facets.tcc index 5f22cde02a2..e4b40af34f3 100644 --- a/libstdc++-v3/include/bits/locale_facets.tcc +++ b/libstdc++-v3/include/bits/locale_facets.tcc @@ -303,8 +303,8 @@ namespace std __max_digits = __max; else if (__base == 16) __max_digits = static_cast<int>(ceil(__max * _S_scale_hex)); - else if (__base == 8) - __max_digits = static_cast<int>(ceil(__max * _S_scale_oct)); + else /* if (__base == 8) */ + __max_digits = static_cast<int>(ceil(__max * _S_scale_oct)); // Add in what's already been extracted. __max_digits += __pos; |