niklas/rcl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #14 from ros2/fix_gcc5

Browse source 
change preprocess logic to fix error with gcc5
This commit is contained in:
William Woodall 2016-01-05 12:07:31 -08:00
commit 004698a973
1 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
rcl/src/rcl/stdatomic_helper.h
View file

@ -20,9 +20,11 @@
#if defined(__GNUC__) && __GNUC__ <= 4 && __GNUC_MINOR__ <= 9 #if defined(__GNUC__) && __GNUC__ <= 4 && __GNUC_MINOR__ <= 9
// If GCC and below GCC-4.9, use the compatability header. // If GCC and below GCC-4.9, use the compatability header.
#include "stdatomic_helper/gcc/stdatomic.h" #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. // If Clang and no c_atomics (true for some older versions), use the compatability header.
#include "stdatomic_helper/gcc/stdatomic.h" #include "stdatomic_helper/gcc/stdatomic.h"
#endif
#else #else
#include <stdatomic.h> #include <stdatomic.h>
#endif #endif