From ec0e9306d0ef7c702f024a8a8417e1f177c3a6fc Mon Sep 17 00:00:00 2001 From: William Woodall Date: Tue, 5 Jan 2016 12:01:42 -0800 Subject: [PATCH] change preprocess logic to fix error with gcc5 fixes #13 --- rcl/src/rcl/stdatomic_helper.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/rcl/src/rcl/stdatomic_helper.h b/rcl/src/rcl/stdatomic_helper.h index 1c1c7a79a8..89aeff4028 100644 --- a/rcl/src/rcl/stdatomic_helper.h +++ b/rcl/src/rcl/stdatomic_helper.h @@ -20,9 +20,11 @@ #if defined(__GNUC__) && __GNUC__ <= 4 && __GNUC_MINOR__ <= 9 // If GCC and below GCC-4.9, use the compatability header. #include "stdatomic_helper/gcc/stdatomic.h" -#elif defined(__clang__) && defined(__has_feature) && !__has_feature(c_atomic) +#elif defined(__clang__) && defined(__has_feature) +#if !__has_feature(c_atomic) // If Clang and no c_atomics (true for some older versions), use the compatability header. #include "stdatomic_helper/gcc/stdatomic.h" +#endif #else #include #endif