generic-library/cxx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix bug #18350. Add tests for tuples of all the smart pointers (except auto_ptr)

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@207307 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Marshall Clow 2014-04-26 05:19:48 +00:00
parent 34b571bd88
commit 5f64a2b3c3
2 changed files with 39 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/memory
View File

@ -2401,13 +2401,14 @@ template <class _Ptr1, class _Ptr2>
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

35
test/utilities/tuple/tuple.general/tuple.smartptr.pass.cpp Normal file
View File

@ -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;
}
}