aboutsummaryrefslogtreecommitdiff
path: root/libstdc++-v3/include
diff options
context:
space:
mode:
authorJonathan Wakely <jwakely@redhat.com>2014-09-23 14:17:42 +0100
committerJonathan Wakely <redi@gcc.gnu.org>2014-09-23 14:17:42 +0100
commit48e968a72081812d4e0c271b5397fbffa2ba7e3a (patch)
tree29f152b627ad8d3ee2f4671f4aa0011c0ebf7996 /libstdc++-v3/include
parent4f9427792ea37fd06a9ca0dc965acaf04a33bbb2 (diff)
downloadgcc-48e968a72081812d4e0c271b5397fbffa2ba7e3a.zip
gcc-48e968a72081812d4e0c271b5397fbffa2ba7e3a.tar.gz
gcc-48e968a72081812d4e0c271b5397fbffa2ba7e3a.tar.bz2
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
Diffstat (limited to 'libstdc++-v3/include')
-rw-r--r--libstdc++-v3/include/std/istream2
-rw-r--r--libstdc++-v3/include/std/ostream2
2 files changed, 2 insertions, 2 deletions
diff --git a/libstdc++-v3/include/std/istream b/libstdc++-v3/include/std/istream
index 3a47616..d4e5d71 100644
--- a/libstdc++-v3/include/std/istream
+++ b/libstdc++-v3/include/std/istream
@@ -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
diff --git a/libstdc++-v3/include/std/ostream b/libstdc++-v3/include/std/ostream
index 748b805..619dbe4 100644
--- a/libstdc++-v3/include/std/ostream
+++ b/libstdc++-v3/include/std/ostream
@@ -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;