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

Fix operator & detection trait to check for free function overloads as well

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@221395 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Eric Fiselier
2014-11-05 20:59:18 +00:00
parent 69697c8506
commit 341b59021c
2 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
include/type_traits
View File

@@ -3642,7 +3642,7 @@ struct underlying_type
#ifndef _LIBCPP_HAS_NO_ADVANCED_SFINAE
template <class _Tp>
struct __has_operator_addressof_imp
struct __has_operator_addressof_member_imp
{
template <class>
static auto __test(__any) -> false_type;
@@ -3653,9 +3653,22 @@ struct __has_operator_addressof_imp
static const bool value = decltype(__test<_Tp>(nullptr))::value;
};
template <class _Tp>
struct __has_operator_addressof_free_imp
{
template <class>
static auto __test(__any) -> false_type;
template <class _Up>
static auto __test(_Up* __u)
-> typename __select_2nd<decltype(operator&(*__u)), true_type>::type;
static const bool value = decltype(__test<_Tp>(nullptr))::value;
};
template <class _Tp>
struct __has_operator_addressof
: public integral_constant<bool, __has_operator_addressof_imp<_Tp>::value>
: public integral_constant<bool, __has_operator_addressof_member_imp<_Tp>::value
|| __has_operator_addressof_free_imp<_Tp>::value>
{};
#endif // _LIBCPP_HAS_NO_ADVANCED_SFINAE