aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDimitry Andric <dim@FreeBSD.org>2016-11-25 19:11:46 +0000
committerDimitry Andric <dim@FreeBSD.org>2016-11-25 19:11:46 +0000
commitb50f1549701eb950921e5d6f2e55ba1a1dadbb43 (patch)
treeb84d5192f070b69bce96266c2ffe86fdda36a0f9
parente947f967d1e30b3973f8a789e682da57481a5ece (diff)
downloadsrc-b50f1549701eb950921e5d6f2e55ba1a1dadbb43.tar.gz
src-b50f1549701eb950921e5d6f2e55ba1a1dadbb43.zip
Notes
Notes: svn path=/vendor/libc++/dist/; revision=309160 svn path=/vendor/libc++/libc++-release_391-r289601/; revision=310165; tag=vendor/libc++/libc++-release_391-r289601
-rw-r--r--include/tuple8
-rw-r--r--test/std/utilities/tuple/tuple.tuple/tuple.cnstr/move.pass.cpp50
2 files changed, 54 insertions, 4 deletions
diff --git a/include/tuple b/include/tuple
index 6805d8c7635b..744a3ff032d0 100644
--- a/include/tuple
+++ b/include/tuple
@@ -681,7 +681,7 @@ public:
<
_CheckArgsConstructor<
_Dummy
- >::template __enable_implicit<_Tp...>(),
+ >::template __enable_implicit<_Tp const&...>(),
bool
>::type = false
>
@@ -699,7 +699,7 @@ public:
<
_CheckArgsConstructor<
_Dummy
- >::template __enable_explicit<_Tp...>(),
+ >::template __enable_explicit<_Tp const&...>(),
bool
>::type = false
>
@@ -717,7 +717,7 @@ public:
<
_CheckArgsConstructor<
_Dummy
- >::template __enable_implicit<_Tp...>(),
+ >::template __enable_implicit<_Tp const&...>(),
bool
>::type = false
>
@@ -736,7 +736,7 @@ public:
<
_CheckArgsConstructor<
_Dummy
- >::template __enable_explicit<_Tp...>(),
+ >::template __enable_explicit<_Tp const&...>(),
bool
>::type = false
>
diff --git a/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/move.pass.cpp b/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/move.pass.cpp
index 1bd7d6d4e8a8..0c93673532bb 100644
--- a/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/move.pass.cpp
+++ b/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/move.pass.cpp
@@ -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()
{
{
@@ -72,4 +118,8 @@ int main()
d_t d((ConstructsWithTupleLeaf()));
d_t d2(static_cast<d_t &&>(d));
}
+ {
+ test_sfinae<move_only_ebo>();
+ test_sfinae<move_only_large>();
+ }
}