@@ -1971,7 +1971,7 @@ typedef integral_constant<bool, true> true_type;
1971
1971
1972
1972
// *********************************************
1973
1973
// is_assignable
1974
- #if defined( ETL_USING_BUILTIN_IS_ASSIGNABLE) || defined(ETL_USE_TYPE_TRAITS_BUILTINS)
1974
+ #if ETL_USING_BUILTIN_IS_ASSIGNABLE
1975
1975
template <typename T1, typename T2>
1976
1976
struct is_assignable
1977
1977
{
@@ -1985,7 +1985,7 @@ typedef integral_constant<bool, true> true_type;
1985
1985
#endif
1986
1986
1987
1987
#if ETL_USING_CPP11
1988
- #if defined( ETL_USING_BUILTIN_IS_CONSTRUCTIBLE) || defined(ETL_USE_TYPE_TRAITS_BUILTINS)
1988
+ #if ETL_USING_BUILTIN_IS_CONSTRUCTIBLE
1989
1989
// *********************************************
1990
1990
// is_constructible
1991
1991
template <typename T, typename ... TArgs>
@@ -2029,7 +2029,7 @@ typedef integral_constant<bool, true> true_type;
2029
2029
template <> struct is_move_constructible <void const volatile > : public false_type{};
2030
2030
2031
2031
#else
2032
- #if defined( ETL_USING_BUILTIN_IS_CONSTRUCTIBLE) || defined(ETL_USE_TYPE_TRAITS_BUILTINS)
2032
+ #if ETL_USING_BUILTIN_IS_CONSTRUCTIBLE
2033
2033
// *********************************************
2034
2034
// is_constructible
2035
2035
template <typename T, typename TArgs = void >
@@ -2070,7 +2070,7 @@ typedef integral_constant<bool, true> true_type;
2070
2070
#endif
2071
2071
#endif
2072
2072
2073
- #if defined( ETL_USING_BUILTIN_IS_TRIVIALLY_CONSTRUCTIBLE) || defined(ETL_USE_TYPE_TRAITS_BUILTINS)
2073
+ #if ETL_USING_BUILTIN_IS_TRIVIALLY_CONSTRUCTIBLE
2074
2074
#if ETL_USING_CPP11
2075
2075
// *********************************************
2076
2076
// is_trivially_constructible
@@ -2130,7 +2130,7 @@ typedef integral_constant<bool, true> true_type;
2130
2130
};
2131
2131
#endif
2132
2132
2133
- #if defined( ETL_USING_BUILTIN_IS_TRIVIALLY_DESTRUCTIBLE) || defined(ETL_USE_TYPE_TRAITS_BUILTINS)
2133
+ #if ETL_USING_BUILTIN_IS_TRIVIALLY_DESTRUCTIBLE
2134
2134
// *********************************************
2135
2135
// is_trivially_destructible
2136
2136
template <typename T>
@@ -2151,7 +2151,7 @@ typedef integral_constant<bool, true> true_type;
2151
2151
};
2152
2152
#endif
2153
2153
2154
- #if defined( ETL_USING_BUILTIN_IS_TRIVIALLY_COPYABLE) || defined(ETL_USE_TYPE_TRAITS_BUILTINS)
2154
+ #if ETL_USING_BUILTIN_IS_TRIVIALLY_COPYABLE
2155
2155
// *********************************************
2156
2156
// is_trivially_copy_assignable
2157
2157
template <typename T>
0 commit comments