LineageOS/android_external_libcxx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix PR26103 - Error calling is_convertible with incomplete type. Patch from Michael Daniels.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@258852 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Eric Fiselier
2016-01-26 20:24:30 +00:00
parent 73de880a44
commit e01f946792
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/type_traits
View File

@@ -1347,10 +1347,9 @@ struct __is_convertible_test : public false_type {};
template <class _From, class _To> template <class _From, class _To>
struct __is_convertible_test<_From, _To, struct __is_convertible_test<_From, _To,
decltype(__test_convert<_To>(_VSTD::declval<_From>()))> : public true_type decltype(_VSTD::__is_convertible_imp::__test_convert<_To>(_VSTD::declval<_From>()))> : public true_type
{}; {};
template <class _Tp> __two __test(...);
#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
template <class _Tp> _Tp&& __source(); template <class _Tp> _Tp&& __source();
#else #else

8
test/std/utilities/meta/meta.rel/is_convertible.pass.cpp
View File

@@ -52,6 +52,11 @@ class NonCopyable {
NonCopyable(NonCopyable&); NonCopyable(NonCopyable&);
}; };
template <typename T>
class CannotInstantiate {
enum { X = T::ThisExpressionWillBlowUp };
};
int main() int main()
{ {
// void // void
@@ -206,4 +211,7 @@ int main()
test_is_not_convertible<NonCopyable&, NonCopyable>(); test_is_not_convertible<NonCopyable&, NonCopyable>();
#endif #endif
// Ensure that CannotInstantiate is not instantiated by is_convertible when it is not needed.
// For example CannotInstantiate is instatiated as a part of ADL lookup for arguments of type CannotInstantiate*.
static_assert((std::is_convertible<CannotInstantiate<int>*, CannotInstantiate<int>*>::value), "");
} }