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

gnu.ver: Adjust basic_ostream exports. 

* config/abi/pre/gnu.ver: Adjust basic_ostream exports.
	* include/std/istream (basic_iostream(basic_iostream&&)): Pass *this
	to ostream constructor.
	* include/std/ostream (basic_ostream(basic_iostream*)): Change to take
	parameter by reference, to avoid ambiguity.
	* testsuite/27_io/basic_ostream/cons/char/null.cc: New.

From-SVN: r215510
This commit is contained in:
Jonathan Wakely 2014-09-23 14:17:42 +01:00 committed by Jonathan Wakely
parent 4f9427792e
commit 48e968a720
5 changed files with 44 additions and 5 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 @@
2014-09-23 Jonathan Wakely <jwakely@redhat.com>
* config/abi/pre/gnu.ver: Adjust basic_ostream exports.
* include/std/istream (basic_iostream(basic_iostream&&)): Pass *this
to ostream constructor.
* include/std/ostream (basic_ostream(basic_iostream*)): Change to take
parameter by reference, to avoid ambiguity.
* testsuite/27_io/basic_ostream/cons/char/null.cc: New.
2014-09-22 Jason Merrill <jason@redhat.com>
* testsuite/Makefile.am (%/site.exp): Add @.

6
libstdc++-v3/config/abi/pre/gnu.ver
View File

@ -1413,9 +1413,9 @@ GLIBCXX_3.4.21 {
_ZN9__gnu_cxx18stdio_sync_filebufI[cw]St11char_traitsI[cw]EEaSEOS3_;
_ZN9__gnu_cxx18stdio_sync_filebufI[cw]St11char_traitsI[cw]EEC[12]EOS3_;
# basic_ostream<C,T>::basic_ostream(basic_iostream<C,T>*)
_ZNSoC[12]EPSd;
_ZNSt13basic_ostreamIwSt11char_traitsIwEEC[12]EPSt14basic_iostreamIwS1_E;
# basic_ostream<C,T>::basic_ostream(basic_iostream<C,T>&)
_ZNSoC[12]ERSd;
_ZNSt13basic_ostreamIwSt11char_traitsIwEEC[12]ERSt14basic_iostreamIwS1_E;
} GLIBCXX_3.4.20;

2
libstdc++-v3/include/std/istream
View File

@ -863,7 +863,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
basic_iostream(const basic_iostream&) = delete;
basic_iostream(basic_iostream&& __rhs)
: __istream_type(std::move(__rhs)), __ostream_type(this)
: __istream_type(std::move(__rhs)), __ostream_type(*this)
{ }
// 27.7.3.3 Assign/swap

2
libstdc++-v3/include/std/ostream
View File

@ -386,7 +386,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
#if __cplusplus >= 201103L
// Non-standard constructor that does not call init()
basic_ostream(basic_iostream<_CharT, _Traits>*) { }
basic_ostream(basic_iostream<_CharT, _Traits>&) { }
basic_ostream(const basic_ostream&) = delete;

30
libstdc++-v3/testsuite/27_io/basic_ostream/cons/char/null.cc Normal file
View File

@ -0,0 +1,30 @@
// Copyright (C) 2014 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-options "-std=gnu++11" }
// { dg-do compile }
#include <ostream>
// https://gcc.gnu.org/ml/libstdc++/2014-09/msg00108.html
struct O : std::ostream
{
O() : std::ostream(NULL) { }
O(int) : std::ostream(nullptr) { }
};
O o;