Commit 565115ea by Jonathan Wakely Committed by Jonathan Wakely

Make reference_wrapper trivially copyable.

	* include/std/functional (reference_wrapper): Define copy constructor
	and copy assignment as defaulted.
	* testsuite/20_util/bind/ref_neg.cc: Adjust dg-error.
	* testsuite/20_util/reference_wrapper/requirements.cc: New.

From-SVN: r217067
parent ac6f071a
...@@ -11,6 +11,11 @@ ...@@ -11,6 +11,11 @@
* include/bits/regex.tcc (regex_traits::lookup_classname): Use * include/bits/regex.tcc (regex_traits::lookup_classname): Use
ctype_base::blank. ctype_base::blank.
* include/std/functional (reference_wrapper): Define copy constructor
and copy assignment as defaulted.
* testsuite/20_util/bind/ref_neg.cc: Adjust dg-error.
* testsuite/20_util/reference_wrapper/requirements.cc: New.
2014-11-03 Paolo Carlini <paolo.carlini@oracle.com> 2014-11-03 Paolo Carlini <paolo.carlini@oracle.com>
* include/parallel/algo.h: Do not use default arguments in function * include/parallel/algo.h: Do not use default arguments in function
......
...@@ -410,16 +410,10 @@ _GLIBCXX_HAS_NESTED_TYPE(result_type) ...@@ -410,16 +410,10 @@ _GLIBCXX_HAS_NESTED_TYPE(result_type)
reference_wrapper(_Tp&&) = delete; reference_wrapper(_Tp&&) = delete;
reference_wrapper(const reference_wrapper<_Tp>& __inref) noexcept reference_wrapper(const reference_wrapper&) = default;
: _M_data(__inref._M_data)
{ }
reference_wrapper& reference_wrapper&
operator=(const reference_wrapper<_Tp>& __inref) noexcept operator=(const reference_wrapper&) = default;
{
_M_data = __inref._M_data;
return *this;
}
operator _Tp&() const noexcept operator _Tp&() const noexcept
{ return this->get(); } { return this->get(); }
......
...@@ -30,10 +30,10 @@ void test01() ...@@ -30,10 +30,10 @@ void test01()
{ {
const int dummy = 0; const int dummy = 0;
std::bind(&inc, _1)(0); // { dg-error "no match" } std::bind(&inc, _1)(0); // { dg-error "no match" }
// { dg-error "rvalue|const" "" { target *-*-* } 1213 } // { dg-error "rvalue|const" "" { target *-*-* } 1207 }
// { dg-error "rvalue|const" "" { target *-*-* } 1227 } // { dg-error "rvalue|const" "" { target *-*-* } 1221 }
// { dg-error "rvalue|const" "" { target *-*-* } 1241 } // { dg-error "rvalue|const" "" { target *-*-* } 1235 }
// { dg-error "rvalue|const" "" { target *-*-* } 1255 } // { dg-error "rvalue|const" "" { target *-*-* } 1249 }
std::bind(&inc, std::ref(dummy))(); // { dg-error "no match" } std::bind(&inc, std::ref(dummy))(); // { dg-error "no match" }
} }
......
// 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 <functional>
struct NonTrivial
{
~NonTrivial() { }
};
using R = std::reference_wrapper<NonTrivial>;
static_assert(std::is_copy_constructible<R>::value, "copy constructible");
static_assert(std::is_copy_assignable<R>::value, "copy assignable");
static_assert(std::is_trivially_copyable<R>::value, "trivially copyable");
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment