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

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
This commit is contained in:
Jonathan Wakely 2014-11-04 02:49:33 +00:00 committed by Jonathan Wakely
parent ac6f071ad9
commit 565115eaaf
4 changed files with 43 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libstdc++-v3/ChangeLog
View File

@ -11,6 +11,11 @@
* include/bits/regex.tcc (regex_traits::lookup_classname): Use
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>
* include/parallel/algo.h: Do not use default arguments in function

10
libstdc++-v3/include/std/functional
View File

@ -410,16 +410,10 @@ _GLIBCXX_HAS_NESTED_TYPE(result_type)
reference_wrapper(_Tp&&) = delete;
reference_wrapper(const reference_wrapper<_Tp>& __inref) noexcept
: _M_data(__inref._M_data)
{ }
reference_wrapper(const reference_wrapper&) = default;
reference_wrapper&
operator=(const reference_wrapper<_Tp>& __inref) noexcept
{
_M_data = __inref._M_data;
return *this;
}
operator=(const reference_wrapper&) = default;
operator _Tp&() const noexcept
{ return this->get(); }

8
libstdc++-v3/testsuite/20_util/bind/ref_neg.cc
View File

@ -30,10 +30,10 @@ void test01()
{
const int dummy = 0;
std::bind(&inc, _1)(0); // { dg-error "no match" }
// { dg-error "rvalue|const" "" { target *-*-* } 1213 }
// { dg-error "rvalue|const" "" { target *-*-* } 1227 }
// { dg-error "rvalue|const" "" { target *-*-* } 1241 }
// { dg-error "rvalue|const" "" { target *-*-* } 1255 }
// { dg-error "rvalue|const" "" { target *-*-* } 1207 }
// { dg-error "rvalue|const" "" { target *-*-* } 1221 }
// { dg-error "rvalue|const" "" { target *-*-* } 1235 }
// { dg-error "rvalue|const" "" { target *-*-* } 1249 }
std::bind(&inc, std::ref(dummy))(); // { dg-error "no match" }
}

32
libstdc++-v3/testsuite/20_util/reference_wrapper/requirements.cc Normal file
View File

@ -0,0 +1,32 @@
// 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");