Commit 1ec0f763 by Ville Voutilainen Committed by Ville Voutilainen

Fix the constraints for any's assignment operator template to properly

reject assignment from a non-copyable lvalue.

From-SVN: r238365
parent 8d4fc2d3
2016-07-14 Ville Voutilainen <ville.voutilainen@gmail.com>
Fix the constraints for any's assignment operator template to properly
reject assignment from a non-copyable lvalue.
* include/std/any (operator=(_ValueType&&)): Constrain the decayed
type for is_copy_constructible,
* testsuite/20_util/any/requirements.cc: Add a test for
non-copyable lvalues.
2016-07-14 Jonathan Wakely <jwakely@redhat.com>
* include/experimental/functional: Include <parallel/algorithm> in
......
......@@ -238,9 +238,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
}
/// Store a copy of @p __rhs as the contained object.
template<typename _ValueType>
enable_if_t<__and_<__not_<is_same<any, decay_t<_ValueType>>>,
is_copy_constructible<_ValueType>>::value, any&>
template<typename _ValueType,
typename _Tp = _Decay<_ValueType>>
enable_if_t<is_copy_constructible<_Tp>::value, any&>
operator=(_ValueType&& __rhs)
{
*this = any(std::forward<_ValueType>(__rhs));
......
......@@ -30,4 +30,7 @@ static_assert(std::is_assignable<any&, int>::value);
static_assert(!std::is_assignable<any&, unique_ptr<int>>::value);
static_assert(std::is_constructible<any, int>::value);
static_assert(!std::is_constructible<any, unique_ptr<int>>::value);
static_assert(!std::is_assignable<any&, const unique_ptr<int>&>::value);
static_assert(!std::is_constructible<any&, const unique_ptr<int>&>::value);
static_assert(!std::is_assignable<any&, unique_ptr<int>&>::value);
static_assert(!std::is_constructible<any&, unique_ptr<int>&>::value);
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