Skip to content

Commit bdeca28

Browse files
committed
Update macro conditions to check value of macros
1 parent 10a9b4b commit bdeca28

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

include/etl/type_traits.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1971,7 +1971,7 @@ typedef integral_constant<bool, true> true_type;
19711971

19721972
//*********************************************
19731973
// is_assignable
1974-
#if defined(ETL_USING_BUILTIN_IS_ASSIGNABLE) || defined(ETL_USE_TYPE_TRAITS_BUILTINS)
1974+
#if ETL_USING_BUILTIN_IS_ASSIGNABLE
19751975
template<typename T1, typename T2>
19761976
struct is_assignable
19771977
{
@@ -1985,7 +1985,7 @@ typedef integral_constant<bool, true> true_type;
19851985
#endif
19861986

19871987
#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
19891989
//*********************************************
19901990
// is_constructible
19911991
template<typename T, typename... TArgs>
@@ -2029,7 +2029,7 @@ typedef integral_constant<bool, true> true_type;
20292029
template <> struct is_move_constructible<void const volatile> : public false_type{};
20302030

20312031
#else
2032-
#if defined(ETL_USING_BUILTIN_IS_CONSTRUCTIBLE) || defined(ETL_USE_TYPE_TRAITS_BUILTINS)
2032+
#if ETL_USING_BUILTIN_IS_CONSTRUCTIBLE
20332033
//*********************************************
20342034
// is_constructible
20352035
template<typename T, typename TArgs = void>
@@ -2070,7 +2070,7 @@ typedef integral_constant<bool, true> true_type;
20702070
#endif
20712071
#endif
20722072

2073-
#if defined(ETL_USING_BUILTIN_IS_TRIVIALLY_CONSTRUCTIBLE) || defined(ETL_USE_TYPE_TRAITS_BUILTINS)
2073+
#if ETL_USING_BUILTIN_IS_TRIVIALLY_CONSTRUCTIBLE
20742074
#if ETL_USING_CPP11
20752075
//*********************************************
20762076
// is_trivially_constructible
@@ -2130,7 +2130,7 @@ typedef integral_constant<bool, true> true_type;
21302130
};
21312131
#endif
21322132

2133-
#if defined(ETL_USING_BUILTIN_IS_TRIVIALLY_DESTRUCTIBLE) || defined(ETL_USE_TYPE_TRAITS_BUILTINS)
2133+
#if ETL_USING_BUILTIN_IS_TRIVIALLY_DESTRUCTIBLE
21342134
//*********************************************
21352135
// is_trivially_destructible
21362136
template <typename T>
@@ -2151,7 +2151,7 @@ typedef integral_constant<bool, true> true_type;
21512151
};
21522152
#endif
21532153

2154-
#if defined(ETL_USING_BUILTIN_IS_TRIVIALLY_COPYABLE) || defined(ETL_USE_TYPE_TRAITS_BUILTINS)
2154+
#if ETL_USING_BUILTIN_IS_TRIVIALLY_COPYABLE
21552155
//*********************************************
21562156
// is_trivially_copy_assignable
21572157
template <typename T>

0 commit comments

Comments
 (0)