diff options
| author | Paolo Carlini <pcarlini@suse.de> | 2004-01-13 18:53:57 +0000 |
|---|---|---|
| committer | Paolo Carlini <paolo@gcc.gnu.org> | 2004-01-13 18:53:57 +0000 |
| commit | d8ef7deccb6f1b263de9820f3eefb7a9c3d03a5f (patch) | |
| tree | 26cc1137ddbc035dc19eaa96d96673f3b5d07f23 | |
| parent | e6cca48823328c175768c9b14f0ca64817a47319 (diff) | |
| download | gcc-d8ef7deccb6f1b263de9820f3eefb7a9c3d03a5f.zip gcc-d8ef7deccb6f1b263de9820f3eefb7a9c3d03a5f.tar.gz gcc-d8ef7deccb6f1b263de9820f3eefb7a9c3d03a5f.tar.bz2 | |
locale_facets.tcc (num_get::do_get(void*&)): Set correctly just basefield, the only group that matters.
2004-01-13 Paolo Carlini <pcarlini@suse.de>
* include/bits/locale_facets.tcc (num_get::do_get(void*&)):
Set correctly just basefield, the only group that matters.
From-SVN: r75810
| -rw-r--r-- | libstdc++-v3/ChangeLog | 5 | ||||
| -rw-r--r-- | libstdc++-v3/include/bits/locale_facets.tcc | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 59702aa..6df16ea 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,10 @@ 2004-01-13 Paolo Carlini <pcarlini@suse.de> + * include/bits/locale_facets.tcc (num_get::do_get(void*&)): + Set correctly just basefield, the only group that matters. + +2004-01-13 Paolo Carlini <pcarlini@suse.de> + * include/ext/rope (_Rope_rep_alloc_base): Eliminate. (_Rope_rep_base): Inherit directly from the rope allocator; use rebinding instead of _Alloc_traits; pick up data member diff --git a/libstdc++-v3/include/bits/locale_facets.tcc b/libstdc++-v3/include/bits/locale_facets.tcc index 879b9e3..d781503 100644 --- a/libstdc++-v3/include/bits/locale_facets.tcc +++ b/libstdc++-v3/include/bits/locale_facets.tcc @@ -655,9 +655,7 @@ namespace std // Prepare for hex formatted input. typedef ios_base::fmtflags fmtflags; const fmtflags __fmt = __io.flags(); - const fmtflags __fmtmask = ~(ios_base::showpos | ios_base::basefield - | ios_base::uppercase | ios_base::internal); - __io.flags(__fmt & __fmtmask | (ios_base::hex | ios_base::showbase)); + __io.flags(__fmt & ~ios_base::basefield | ios_base::hex); unsigned long __ul; __beg = _M_extract_int(__beg, __end, __io, __err, __ul); |