mirrors/gcc
0
0
Fork 0
mirror of https://gcc.gnu.org/git/gcc.git synced 2024-12-02 16:23:56 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Nathan C.

Browse Source 
2003-06-26  Paolo Carlini  <pcarlini@unitus.it>
            Nathan C. Myers  <ncm-nospam@cantrip.org>

	* include/bits/fstream.tcc (_M_underflow): When the actual
	end of file is reached, set 'uncommitted' mode to allow a
	next write without an intervening seek (see C++98 27.8.1.1,2
	and C89 7.9.5.3).
	* testsuite/27_io/basic_filebuf/underflow/char/2.cc: New.

Co-Authored-By: Nathan C. Myers <ncm-nospam@cantrip.org>

From-SVN: r68522
This commit is contained in:
Paolo Carlini 2003-06-26 11:55:24 +02:00 committed by Paolo Carlini
parent 1c72f4ef67
commit 2cfe4e6898
3 changed files with 67 additions and 2 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-06-26 Paolo Carlini <pcarlini@unitus.it>
Nathan C. Myers <ncm-nospam@cantrip.org>
* include/bits/fstream.tcc (_M_underflow): When the actual
end of file is reached, set 'uncommitted' mode to allow a
next write without an intervening seek (see C++98 27.8.1.1,2
and C89 7.9.5.3).
* testsuite/27_io/basic_filebuf/underflow/char/2.cc: New.
2003-06-25 Nathan C. Myers <ncm-nospam@cantrip.org>
* include/bits/streambuf.tcc (sbumpc, sputbackc, sungetc,

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

@ -215,7 +215,7 @@ namespace std
{
char* __buf = static_cast<char*>(__builtin_alloca(__buflen));
__elen = _M_file.xsgetn(__buf, __buflen);
const char* __eend;
char_type* __iend;
codecvt_base::result __r;
@ -246,7 +246,15 @@ namespace std
__ret = traits_type::to_int_type(*this->gptr());
if (__bump)
this->gbump(1);
}
}
else if (__elen == 0)
{
// If the actual end of file is reached, set 'uncommitted'
// mode, thus allowing an immediate write without an
// intervening seek.
_M_set_buffer(-1);
_M_reading = false;
}
}
_M_last_overflowed = false;
return __ret;

48
libstdc++-v3/testsuite/27_io/basic_filebuf/underflow/char/2.cc Normal file
View File

@ -0,0 +1,48 @@
// 2003-06-25 Paolo Carlini <pcarlini@unitus.it>
// Copyright (C) 2003 Free Software Foundation, Inc.
//
// This file is part of the GNU ISO C++ Library. This library is free
// software; you can redistribute it and/or modify it under the
// terms of the GNU General Public License as published by the
// Free Software Foundation; either version 2, or (at your option)
// any later version.
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
// You should have received a copy of the GNU General Public License along
// with this library; see the file COPYING. If not, write to the Free
// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307,
// USA.
// 27.8.1.4 Overridden virtual functions
#include <fstream>
#include <testsuite_hooks.h>
void test01()
{
bool test = true;
using namespace std;
filebuf fb_out, fb_in_out;
fb_out.open("tmp_underflow.tst", ios::out);
fb_out.sputc('S');
fb_out.sputc('T');
fb_out.close();
fb_in_out.open("tmp_underflow.tst", ios::in | ios::out);
while (fb_in_out.sbumpc() != filebuf::traits_type::eof());
VERIFY( fb_in_out.sputc('x') == 'x' );
fb_in_out.close();
}
int main()
{
test01();
}