diff options
| author | Benjamin Kosnik <bkoz@purist.soma.redhat.com> | 2000-11-02 08:05:16 +0000 |
|---|---|---|
| committer | Benjamin Kosnik <bkoz@gcc.gnu.org> | 2000-11-02 08:05:16 +0000 |
| commit | d83c7eb40da8e67095300c482a036744110e6203 (patch) | |
| tree | 39ca18c62ef940ae2cf7133708a9c737c8a38c7e | |
| parent | 59889957006b2b7be62a206205ff8599c0ad830b (diff) | |
| download | gcc-d83c7eb40da8e67095300c482a036744110e6203.zip gcc-d83c7eb40da8e67095300c482a036744110e6203.tar.gz gcc-d83c7eb40da8e67095300c482a036744110e6203.tar.bz2 | |
locale.cc: Match orderings for static members.
2000-11-02 Benjamin Kosnik <bkoz@purist.soma.redhat.com>
* src/locale.cc: Match orderings for static members.
* include/bits/fstream.tcc: Fixes for cin.
From-SVN: r37200
| -rw-r--r-- | libstdc++-v3/ChangeLog | 5 | ||||
| -rw-r--r-- | libstdc++-v3/include/bits/fstream.tcc | 9 | ||||
| -rw-r--r-- | libstdc++-v3/src/locale.cc | 2 |
3 files changed, 9 insertions, 7 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 2967ba0..56ef6cc 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,8 @@ +2000-11-02 Benjamin Kosnik <bkoz@purist.soma.redhat.com> + + * src/locale.cc: Match orderings for static members. + * include/bits/fstream.tcc: Fixes for cin. + 2000-11-02 Gabriel Dos Reis <gdr@codesourcery.com> * include/bits/std_complex.h (complex<>): Remove (cos<>, cosh<>, diff --git a/libstdc++-v3/include/bits/fstream.tcc b/libstdc++-v3/include/bits/fstream.tcc index d3a5750..72940ea 100644 --- a/libstdc++-v3/include/bits/fstream.tcc +++ b/libstdc++-v3/include/bits/fstream.tcc @@ -240,18 +240,15 @@ namespace std if (0 < __size) { _M_set_determinate(__size); + if (__testout) + _M_out_cur = _M_in_cur; + __ret = traits_type::to_int_type(*_M_in_cur); streamoff __p = _M_file->seekoff(0 - __size, ios_base::cur, ios_base::in); if (__p == -1) { // XXX Something is wrong, do error checking. } - else - { - if (__testout) - _M_out_cur = _M_in_cur; - __ret = traits_type::to_int_type(*_M_in_cur); - } } #else // 2000-08-04 bkoz disable diff --git a/libstdc++-v3/src/locale.cc b/libstdc++-v3/src/locale.cc index 4f886dc..782cec0 100644 --- a/libstdc++-v3/src/locale.cc +++ b/libstdc++-v3/src/locale.cc @@ -53,8 +53,8 @@ namespace std { const locale::category locale::messages; const locale::category locale::all; - locale::_Impl* locale::_S_global; locale::_Impl* locale::_S_classic; + locale::_Impl* locale::_S_global; const int locale::_S_categories_num; const int locale::_S_facets_num; |