llvm/libcxx
1
0
Fork 0
mirror of https://github.com/llvm-mirror/libcxx.git synced 2025-10-23 18:38:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix PR30979 - tuple<move_only> is constructible from move_only const&

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@286774 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Eric Fiselier
2016-11-13 19:54:31 +00:00
parent 66350f0fb1
commit fc044a1ff2
2 changed files with 54 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/tuple
View File

@@ -632,7 +632,7 @@ public:
< <
_CheckArgsConstructor< _CheckArgsConstructor<
_Dummy _Dummy
>::template __enable_implicit<_Tp...>(), >::template __enable_implicit<_Tp const&...>(),
bool bool
>::type = false >::type = false
> >
@@ -650,7 +650,7 @@ public:
< <
_CheckArgsConstructor< _CheckArgsConstructor<
_Dummy _Dummy
>::template __enable_explicit<_Tp...>(), >::template __enable_explicit<_Tp const&...>(),
bool bool
>::type = false >::type = false
> >
@@ -668,7 +668,7 @@ public:
< <
_CheckArgsConstructor< _CheckArgsConstructor<
_Dummy _Dummy
>::template __enable_implicit<_Tp...>(), >::template __enable_implicit<_Tp const&...>(),
bool bool
>::type = false >::type = false
> >
@@ -687,7 +687,7 @@ public:
< <
_CheckArgsConstructor< _CheckArgsConstructor<
_Dummy _Dummy
>::template __enable_explicit<_Tp...>(), >::template __enable_explicit<_Tp const&...>(),
bool bool
>::type = false >::type = false
> >

50
test/std/utilities/tuple/tuple.tuple/tuple.cnstr/move.pass.cpp
View File

@@ -35,6 +35,52 @@ struct ConstructsWithTupleLeaf
} }
}; };
// move_only type which triggers the empty base optimization
struct move_only_ebo {
move_only_ebo() = default;
move_only_ebo(move_only_ebo&&) = default;
};
// a move_only type which does not trigger the empty base optimization
struct move_only_large final {
move_only_large() : value(42) {}
move_only_large(move_only_large&&) = default;
int value;
};
template <class Elem>
void test_sfinae() {
using Tup = std::tuple<Elem>;
using Alloc = std::allocator<void>;
using Tag = std::allocator_arg_t;
// special members
{
static_assert(std::is_default_constructible<Tup>::value, "");
static_assert(std::is_move_constructible<Tup>::value, "");
static_assert(!std::is_copy_constructible<Tup>::value, "");
static_assert(!std::is_constructible<Tup, Tup&>::value, "");
}
// args constructors
{
static_assert(std::is_constructible<Tup, Elem&&>::value, "");
static_assert(!std::is_constructible<Tup, Elem const&>::value, "");
static_assert(!std::is_constructible<Tup, Elem&>::value, "");
}
// uses-allocator special member constructors
{
static_assert(std::is_constructible<Tup, Tag, Alloc>::value, "");
static_assert(std::is_constructible<Tup, Tag, Alloc, Tup&&>::value, "");
static_assert(!std::is_constructible<Tup, Tag, Alloc, Tup const&>::value, "");
static_assert(!std::is_constructible<Tup, Tag, Alloc, Tup &>::value, "");
}
// uses-allocator args constructors
{
static_assert(std::is_constructible<Tup, Tag, Alloc, Elem&&>::value, "");
static_assert(!std::is_constructible<Tup, Tag, Alloc, Elem const&>::value, "");
static_assert(!std::is_constructible<Tup, Tag, Alloc, Elem &>::value, "");
}
}
int main() int main()
{ {
{ {
@@ -72,4 +118,8 @@ int main()
d_t d((ConstructsWithTupleLeaf())); d_t d((ConstructsWithTupleLeaf()));
d_t d2(static_cast<d_t &&>(d)); d_t d2(static_cast<d_t &&>(d));
} }
{
test_sfinae<move_only_ebo>();
test_sfinae<move_only_large>();
}
} }