From 31b8e617b6d429ec2ebfdd882d23f9df26aae04d Mon Sep 17 00:00:00 2001 From: Howard Hinnant Date: Thu, 10 Feb 2011 17:46:03 +0000 Subject: [PATCH] Installed __has_feature(is_convertible_to) and __has_feature(is_base_of) git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@125290 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/type_traits | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/include/type_traits b/include/type_traits index 1c7b096a3..646115110 100644 --- a/include/type_traits +++ b/include/type_traits @@ -598,12 +598,12 @@ template struct _LIBCPP_VISIBLE is_abstract : public __libcpp_abstra // is_convertible -#ifdef __clang__ +#if __has_feature(is_convertible_to) template struct _LIBCPP_VISIBLE is_convertible : public integral_constant {}; -#else // __clang__ +#else // __has_feature(is_convertible_to) namespace __is_convertible_imp { @@ -705,17 +705,17 @@ template struct _LIBCPP_VISIBLE is_convertible static const size_t __complete_check2 = __is_convertible_check<_T2>::__v; }; -#endif // __clang__ +#endif // __has_feature(is_convertible_to) // is_base_of -#ifdef __clang__ +#ifdef __has_feature(is_base_of) template struct _LIBCPP_VISIBLE is_base_of : public integral_constant {}; -#else // __clang__ +#else // __has_feature(is_base_of) // (C) Copyright Rani Sharoni 2003. // Use, modification and distribution are subject to the Boost Software License, @@ -763,7 +763,7 @@ struct _LIBCPP_VISIBLE is_base_of { }; -#endif // __clang__ +#endif // __has_feature(is_base_of) // is_empty