From 398c9d882b34673e5a82be454834d41f6cb8856f Mon Sep 17 00:00:00 2001
From: Marshall Clow <mclow.lists@gmail.com>
Date: Mon, 21 Apr 2014 23:48:09 +0000
Subject: [PATCH] Default the copy and move constructors for __tuple_leaf. This
 fixes bugs 18853 and 19118. Add a test case for that.

git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@206829 91177308-0d34-0410-b5e6-96231b3b80d8
---
 include/tuple                                 | 13 ++-----
 .../tuple/tuple.tuple/TupleFunction.pass.cpp  | 35 +++++++++++++++++++
 2 files changed, 37 insertions(+), 11 deletions(-)
 create mode 100644 test/utilities/tuple/tuple.tuple/TupleFunction.pass.cpp

diff --git a/include/tuple b/include/tuple
index 3a1752ee..27a5a461 100644
--- a/include/tuple
+++ b/include/tuple
@@ -268,17 +268,8 @@ public:
                                 >::value)),
        "Attempted to construct a reference element in a tuple with an rvalue");}
 
-    _LIBCPP_INLINE_VISIBILITY
-    _LIBCPP_CONSTEXPR_AFTER_CXX11
-    __tuple_leaf(const __tuple_leaf& __t) _NOEXCEPT_(is_nothrow_copy_constructible<_Hp>::value)
-        : value(__t.get())
-        {static_assert(!is_rvalue_reference<_Hp>::value, "Can not copy a tuple with rvalue reference member");}
-
-    _LIBCPP_INLINE_VISIBILITY
-    _LIBCPP_CONSTEXPR_AFTER_CXX11
-    __tuple_leaf(__tuple_leaf&& __t) _NOEXCEPT_(is_nothrow_move_constructible<_Hp>::value)
-        : value(_VSTD::forward<_Hp>(__t.get()))
-        {}
+    __tuple_leaf(const __tuple_leaf& __t) = default;
+    __tuple_leaf(__tuple_leaf&& __t) = default;
 
     template <class _Tp>
         _LIBCPP_INLINE_VISIBILITY
diff --git a/test/utilities/tuple/tuple.tuple/TupleFunction.pass.cpp b/test/utilities/tuple/tuple.tuple/TupleFunction.pass.cpp
new file mode 100644
index 00000000..df5fdff5
--- /dev/null
+++ b/test/utilities/tuple/tuple.tuple/TupleFunction.pass.cpp
@@ -0,0 +1,35 @@
+//===----------------------------------------------------------------------===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+// This is for bugs 18853 and 19118
+
+#if __cplusplus >= 201103L
+
+#include <tuple>
+#include <functional>
+
+struct X
+{
+    X() {}
+
+    template <class T>
+    X(T);
+
+    void operator()() {}
+};
+
+int
+main()
+{
+    X x;
+    std::function<void()> f(x);
+}
+#else
+int main () {}
+#endif