From ea348bbe596297d82466a2000dc4c14d2ddc5eac Mon Sep 17 00:00:00 2001 From: Paolo Carlini Date: Wed, 25 Mar 2015 09:57:06 +0000 Subject: [PATCH] re PR libstdc++/65543 (rvalue stream insertion and extraction operators incorrectly implemented) 2015-03-25 Paolo Carlini PR libstdc++/65543 * include/std/istream (operator>>(basic_istream<>&&, _Tp&): Revert thinko in r150387. * include/std/ostream (operator<<(basic_ostream<>&&, const _Tp&): Likewise. * testsuite/27_io/rvalue_streams-2.cc: New. From-SVN: r221655 --- libstdc++-v3/ChangeLog | 9 +++++ libstdc++-v3/include/std/istream | 5 ++- libstdc++-v3/include/std/ostream | 5 ++- .../testsuite/27_io/rvalue_streams-2.cc | 35 +++++++++++++++++++ 4 files changed, 52 insertions(+), 2 deletions(-) create mode 100644 libstdc++-v3/testsuite/27_io/rvalue_streams-2.cc diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 4758be2b0b0..d4611b83b4c 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,12 @@ +2015-03-25 Paolo Carlini + + PR libstdc++/65543 + * include/std/istream (operator>>(basic_istream<>&&, _Tp&): Revert + thinko in r150387. + * include/std/ostream (operator<<(basic_ostream<>&&, const _Tp&): + Likewise. + * testsuite/27_io/rvalue_streams-2.cc: New. + 2015-03-24 Jonathan Wakely PR libstdc++/33394 diff --git a/libstdc++-v3/include/std/istream b/libstdc++-v3/include/std/istream index 9deef435c76..74c0d81e0a3 100644 --- a/libstdc++-v3/include/std/istream +++ b/libstdc++-v3/include/std/istream @@ -922,7 +922,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION template inline basic_istream<_CharT, _Traits>& operator>>(basic_istream<_CharT, _Traits>&& __is, _Tp& __x) - { return (__is >> __x); } + { + __is >> __x; + return __is; + } #endif // C++11 _GLIBCXX_END_NAMESPACE_VERSION diff --git a/libstdc++-v3/include/std/ostream b/libstdc++-v3/include/std/ostream index decb29a5fa3..151c42bede2 100644 --- a/libstdc++-v3/include/std/ostream +++ b/libstdc++-v3/include/std/ostream @@ -626,7 +626,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION template inline basic_ostream<_CharT, _Traits>& operator<<(basic_ostream<_CharT, _Traits>&& __os, const _Tp& __x) - { return (__os << __x); } + { + __os << __x; + return __os; + } #endif // C++11 _GLIBCXX_END_NAMESPACE_VERSION diff --git a/libstdc++-v3/testsuite/27_io/rvalue_streams-2.cc b/libstdc++-v3/testsuite/27_io/rvalue_streams-2.cc new file mode 100644 index 00000000000..d9b61464b58 --- /dev/null +++ b/libstdc++-v3/testsuite/27_io/rvalue_streams-2.cc @@ -0,0 +1,35 @@ +// { dg-options "-std=gnu++11" } +// { dg-do compile } + +// Copyright (C) 2015 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 +// . + +#include + +struct A {}; + +void operator<<(std::ostream&, const A&) { } +void operator>>(std::istream&, A&) { } + +// PR libstdc++/65543 +int main() +{ + A a; + + std::ostringstream() << a; + std::istringstream() >> a; +} -- 2.30.2