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

fstream.tcc (basic_filebuf::showmanyc, [...]): Fix test for synced buffer. 

2003-03-30  Paolo Carlini  <pcarlini@unitus.it>

	* include/bits/fstream.tcc (basic_filebuf::showmanyc,
	_M_convert_to_external, _M_really_overflow, seekoff): Fix
	test for synced buffer.
	* include/std/std_fstream.h (sync): Likewise.
	* src/fstream.cc (basic_filebuf<char>::_M_underflow_common,
	basic_filebuf<wchar_t>::_M_underflow_common): Likewise.

From-SVN: r65038
This commit is contained in:
Paolo Carlini 2003-03-30 10:32:11 +02:00 committed by Paolo Carlini
parent 7270451f19
commit 631693d58d
4 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,12 @@
2003-03-30 Paolo Carlini <pcarlini@unitus.it>
* include/bits/fstream.tcc (basic_filebuf::showmanyc,
_M_convert_to_external, _M_really_overflow, seekoff): Fix
test for synced buffer.
* include/std/std_fstream.h (sync): Likewise.
* src/fstream.cc (basic_filebuf<char>::_M_underflow_common,
basic_filebuf<wchar_t>::_M_underflow_common): Likewise.
2003-03-28 Benjamin Kosnik <bkoz@redhat.com> 2003-03-28 Benjamin Kosnik <bkoz@redhat.com>
* include/std/std_sstream.h (basic_istringstream): Adjust * include/std/std_sstream.h (basic_istringstream): Adjust

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

@ -160,7 +160,7 @@ namespace std
const locale __loc = this->getloc(); const locale __loc = this->getloc();
const __codecvt_type& __cvt = use_facet<__codecvt_type>(__loc); const __codecvt_type& __cvt = use_facet<__codecvt_type>(__loc);
// Sync with stdio. // Sync with stdio.
bool __sync = this->_M_buf_size == 1; bool __sync = this->_M_buf_size <= 1;
if (__testin && this->is_open()) if (__testin && this->is_open())
{ {
@ -285,7 +285,7 @@ namespace std
const locale __loc = this->getloc(); const locale __loc = this->getloc();
const __codecvt_type& __cvt = use_facet<__codecvt_type>(__loc); const __codecvt_type& __cvt = use_facet<__codecvt_type>(__loc);
// Sync with stdio. // Sync with stdio.
bool __sync = this->_M_buf_size == 1; bool __sync = this->_M_buf_size <= 1;
if (__cvt.always_noconv() && __ilen) if (__cvt.always_noconv() && __ilen)
{ {
@ -358,7 +358,7 @@ namespace std
bool __testput = this->_M_out_cur && this->_M_out_beg < this->_M_out_lim; bool __testput = this->_M_out_cur && this->_M_out_beg < this->_M_out_lim;
bool __testunbuffered = _M_file.is_open() && !this->_M_buf_size_opt; bool __testunbuffered = _M_file.is_open() && !this->_M_buf_size_opt;
// Sync with stdio. // Sync with stdio.
bool __sync = this->_M_buf_size == 1; bool __sync = this->_M_buf_size <= 1;
if (__testput || __testunbuffered) if (__testput || __testunbuffered)
{ {
@ -448,7 +448,7 @@ namespace std
bool __testin = (ios_base::in & this->_M_mode & __mode) != 0; bool __testin = (ios_base::in & this->_M_mode & __mode) != 0;
bool __testout = (ios_base::out & this->_M_mode & __mode) != 0; bool __testout = (ios_base::out & this->_M_mode & __mode) != 0;
// Sync with stdio. // Sync with stdio.
bool __sync = this->_M_buf_size == 1; bool __sync = this->_M_buf_size <= 1;
// Should probably do has_facet checks here. // Should probably do has_facet checks here.
int __width = use_facet<__codecvt_type>(this->_M_buf_locale).encoding(); int __width = use_facet<__codecvt_type>(this->_M_buf_locale).encoding();

2
libstdc++-v3/include/std/std_fstream.h
View File

@ -315,7 +315,7 @@ namespace std
bool __testput = this->_M_out_cur bool __testput = this->_M_out_cur
&& this->_M_out_beg < this->_M_out_lim; && this->_M_out_beg < this->_M_out_lim;
// Sync with stdio. // Sync with stdio.
bool __sync = this->_M_buf_size == 1; bool __sync = this->_M_buf_size <= 1;
// Make sure that the internal buffer resyncs its idea of // Make sure that the internal buffer resyncs its idea of
// the file position with the external file. // the file position with the external file.

4
libstdc++-v3/src/fstream.cc
View File

@ -44,7 +44,7 @@ namespace std
bool __testin = _M_mode & ios_base::in; bool __testin = _M_mode & ios_base::in;
bool __testout = _M_mode & ios_base::out; bool __testout = _M_mode & ios_base::out;
// Sync with stdio. // Sync with stdio.
bool __sync = _M_buf_size == 1; bool __sync = _M_buf_size <= 1;
if (__testin) if (__testin)
{ {
@ -126,7 +126,7 @@ namespace std
bool __testin = _M_mode & ios_base::in; bool __testin = _M_mode & ios_base::in;
bool __testout = _M_mode & ios_base::out; bool __testout = _M_mode & ios_base::out;
// Sync with stdio. // Sync with stdio.
bool __sync = _M_buf_size == 1; bool __sync = _M_buf_size <= 1;
if (__testin) if (__testin)
{ {