aboutsummaryrefslogtreecommitdiff
path: root/libstdc++-v3/include
diff options
context:
space:
mode:
authorPaolo Carlini <paolo.carlini@oracle.com>2013-12-09 23:02:18 +0000
committerPaolo Carlini <paolo@gcc.gnu.org>2013-12-09 23:02:18 +0000
commit03fd2f60926c3730ff269a7aa9b05985ccf54273 (patch)
tree211332ea49f0a2c35da093cec00b3333cffe71c3 /libstdc++-v3/include
parentf0c6059cdcd8686feb7a3f1cabf6f2f690573a05 (diff)
downloadgcc-03fd2f60926c3730ff269a7aa9b05985ccf54273.zip
gcc-03fd2f60926c3730ff269a7aa9b05985ccf54273.tar.gz
gcc-03fd2f60926c3730ff269a7aa9b05985ccf54273.tar.bz2
re PR libstdc++/59427 (Opening with ios::in | ios::app does not allow appending)
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
Diffstat (limited to 'libstdc++-v3/include')
-rw-r--r--libstdc++-v3/include/bits/fstream.tcc6
-rw-r--r--libstdc++-v3/include/std/fstream5
2 files changed, 7 insertions, 4 deletions
diff --git a/libstdc++-v3/include/bits/fstream.tcc b/libstdc++-v3/include/bits/fstream.tcc
index 483a576..04debe5 100644
--- a/libstdc++-v3/include/bits/fstream.tcc
+++ b/libstdc++-v3/include/bits/fstream.tcc
@@ -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)
{
diff --git a/libstdc++-v3/include/std/fstream b/libstdc++-v3/include/std/fstream
index 701247a..ce27eb6 100644
--- a/libstdc++-v3/include/std/fstream
+++ b/libstdc++-v3/include/std/fstream
@@ -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