Fix bug #18350. Add tests for tuples of all the smart pointers (except auto_ptr)
llvm-svn: 207307
Cr-Mirrored-From: sso://chromium.googlesource.com/_direct/external/github.com/llvm/llvm-project
Cr-Mirrored-Commit: 85d3e7a7299f0db3286cf0b611bdfac79f39e967
diff --git a/include/memory b/include/memory
index da8786a..d19bb7f 100644
--- a/include/memory
+++ b/include/memory
@@ -2401,13 +2401,14 @@
struct __same_or_less_cv_qualified_imp<_Ptr1, _Ptr2, false>
: false_type {};
-template <class _Ptr1, class _Ptr2, bool = is_scalar<_Ptr1>::value &&
- !is_pointer<_Ptr1>::value>
+template <class _Ptr1, class _Ptr2, bool = is_pointer<_Ptr1>::value ||
+ is_same<_Ptr1, _Ptr2>::value ||
+ __has_element_type<_Ptr1>::value>
struct __same_or_less_cv_qualified
: __same_or_less_cv_qualified_imp<_Ptr1, _Ptr2> {};
template <class _Ptr1, class _Ptr2>
-struct __same_or_less_cv_qualified<_Ptr1, _Ptr2, true>
+struct __same_or_less_cv_qualified<_Ptr1, _Ptr2, false>
: false_type {};
// default_delete
diff --git a/test/utilities/tuple/tuple.general/tuple.smartptr.pass.cpp b/test/utilities/tuple/tuple.general/tuple.smartptr.pass.cpp
new file mode 100644
index 0000000..2862762
--- /dev/null
+++ b/test/utilities/tuple/tuple.general/tuple.smartptr.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.
+//
+//===----------------------------------------------------------------------===//
+//
+// Tuples of smart pointers; based on bug #18350
+// auto_ptr doesn't have a copy constructor that takes a const &, but tuple does.
+
+#include <tuple>
+#include <memory>
+
+int main () {
+ {
+ std::tuple<std::unique_ptr<char>> up;
+ std::tuple<std::shared_ptr<char>> sp;
+ std::tuple<std::weak_ptr <char>> wp;
+// std::tuple<std::auto_ptr <char>> ap;
+ }
+ {
+ std::tuple<std::unique_ptr<char[]>> up;
+ std::tuple<std::shared_ptr<char[]>> sp;
+ std::tuple<std::weak_ptr <char[]>> wp;
+// std::tuple<std::auto_ptr <char[]>> ap;
+ }
+ {
+ std::tuple<std::unique_ptr<char[5]>> up;
+ std::tuple<std::shared_ptr<char[5]>> sp;
+ std::tuple<std::weak_ptr <char[5]>> wp;
+// std::tuple<std::auto_ptr <char[5]>> ap;
+ }
+}
\ No newline at end of file