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

re PR libstdc++/59427 (Opening with ios::in | ios::app does not allow appending)

Browse Source 
2013-12-09  Paolo Carlini  <paolo.carlini@oracle.com>

	PR libstdc++/59427
	* include/bits/fstream.tcc (basic_filebuf<>::overflow,
	basic_filebuf<>::xsputn): Per lwg/596, ios_base::app implies
	ios_base:out.
	* include/std/fstream (basic_filebuf<>::_M_set_buffer): Likewise.
	* testsuite/27_io/basic_filebuf/sputc/char/59427.cc: New.
	* testsuite/27_io/basic_filebuf/sputn/char/59427.cc: Likewise.

From-SVN: r205837
This commit is contained in:
Paolo Carlini 2013-12-09 23:02:18 +00:00 committed by Paolo Carlini
parent f0c6059cdc
commit 03fd2f6092
5 changed files with 95 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,13 @@
2013-12-09 Paolo Carlini <paolo.carlini@oracle.com>
PR libstdc++/59427
* include/bits/fstream.tcc (basic_filebuf<>::overflow,
basic_filebuf<>::xsputn): Per lwg/596, ios_base::app implies
ios_base:out.
* include/std/fstream (basic_filebuf<>::_M_set_buffer): Likewise.
* testsuite/27_io/basic_filebuf/sputc/char/59427.cc: New.
* testsuite/27_io/basic_filebuf/sputn/char/59427.cc: Likewise.
2013-12-09 Renlin Li <Renlin.Li@arm.com>
* testsuite/20_util/hash/chi2_quality.cc: Change -DSAMPLES=30000.

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

@ -423,7 +423,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
{
int_type __ret = traits_type::eof();
const bool __testeof = traits_type::eq_int_type(__c, __ret);
const bool __testout = _M_mode & ios_base::out;
const bool __testout = (_M_mode & ios_base::out
|| _M_mode & ios_base::app);
if (__testout)
{
if (_M_reading)
@ -640,7 +641,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
// Optimization in the always_noconv() case, to be generalized in the
// future: when __n is sufficiently large we write directly instead of
// using the buffer.
const bool __testout = _M_mode & ios_base::out;
const bool __testout = (_M_mode & ios_base::out
|| _M_mode & ios_base::app);
if (__check_facet(_M_codecvt).always_noconv()
&& __testout && !_M_reading)
{

5
libstdc++-v3/include/std/fstream
View File

@ -397,8 +397,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
_M_set_buffer(streamsize __off)
{
const bool __testin = _M_mode & ios_base::in;
const bool __testout = _M_mode & ios_base::out;
const bool __testout = (_M_mode & ios_base::out
|| _M_mode & ios_base::app);
if (__testin && __off > 0)
this->setg(_M_buf, _M_buf, _M_buf + __off);
else

39
libstdc++-v3/testsuite/27_io/basic_filebuf/sputc/char/59427.cc Normal file
View File

@ -0,0 +1,39 @@
// Copyright (C) 2013 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 3, 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 COPYING3. If not see
// <http://www.gnu.org/licenses/>.
// { dg-require-fileio "" }
#include <fstream>
#include <testsuite_hooks.h>
// libstdc++/59427
void test01()
{
bool test __attribute__((unused)) = true;
using namespace std;
filebuf a_f;
VERIFY( a_f.open("tmp_59427_sputc", ios_base::in | ios_base::app) );
VERIFY( 'a' == a_f.sputc('a') );
VERIFY( a_f.close() );
}
int main()
{
test01();
return 0;
}

39
libstdc++-v3/testsuite/27_io/basic_filebuf/sputn/char/59427.cc Normal file
View File

@ -0,0 +1,39 @@
// Copyright (C) 2013 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 3, 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 COPYING3. If not see
// <http://www.gnu.org/licenses/>.
// { dg-require-fileio "" }
#include <fstream>
#include <testsuite_hooks.h>
// libstdc++/59427
void test01()
{
bool test __attribute__((unused)) = true;
using namespace std;
filebuf a_f;
VERIFY( a_f.open("tmp_59427_sputn", ios_base::in | ios_base::app) );
VERIFY( 5 == a_f.sputn("abcde", 5) );
VERIFY( a_f.close() );
}
int main()
{
test01();
return 0;
}