Merge pull request ros2#14 from ros2/fix_gcc5

change preprocess logic to fix error with gcc5
ApexAI · Jan 5, 2016 · 004698a · 004698a
2 parents 2e5ee42 + ec0e930
commit 004698a
Showing 1 changed file with 3 additions and 1 deletion.
diff --git 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 <stdatomic.h>
 #endif