OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
Benjamin Kosnik 2000-11-02 08:05:16 +00:00 committed by Benjamin Kosnik
parent 5988995700
commit d83c7eb40d
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libstdc++-v3/ChangeLog
View File

@ -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<>,

9
libstdc++-v3/include/bits/fstream.tcc
View File

@ -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

2
libstdc++-v3/src/locale.cc
View File

@ -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;