diff options
| author | Eric Fiselier <eric@efcs.ca> | 2016-01-26 20:24:30 +0000 |
|---|---|---|
| committer | Eric Fiselier <eric@efcs.ca> | 2016-01-26 20:24:30 +0000 |
| commit | 060cc200d05f461ede7bb066d94f854e3481e6ea (patch) | |
| tree | 6e711415c3a9c186056b0c3afe4df2ad79f47ee1 /libcxx/include | |
| parent | 1a6c7608b1f47dadf7adae8dbc1fb8345f7ff15e (diff) | |
| download | bcm5719-llvm-060cc200d05f461ede7bb066d94f854e3481e6ea.tar.gz bcm5719-llvm-060cc200d05f461ede7bb066d94f854e3481e6ea.zip | |
Fix PR26103 - Error calling is_convertible with incomplete type. Patch from Michael Daniels.
llvm-svn: 258852
Diffstat (limited to 'libcxx/include')
| -rw-r--r-- | libcxx/include/type_traits | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libcxx/include/type_traits b/libcxx/include/type_traits index f13e29f971b..3c9e8dd9021 100644 --- a/libcxx/include/type_traits +++ b/libcxx/include/type_traits @@ -1347,10 +1347,9 @@ struct __is_convertible_test : public false_type {}; template <class _From, class _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 template <class _Tp> _Tp&& __source(); #else |
