Skip to content

GitLab

Commit 605fcddd authored by Lynn Garren's avatar Lynn Garren
Browse files
Options

modern clang compilers without atomic fail the __cplusplus >= 201103L test

parent 6c56d469
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 14 deletions
Utility/Utility/atomic_int.h
View file @ 605fcddd
......@@ -10,16 +10,9 @@
#if __cplusplus >= 201103L
#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 7) || USING_VISUAL
#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 7) || __clang__ || USING_VISUAL
#include <atomic>
#define CLHEP_ATOMIC_INT_TYPE std::atomic<int>
#elif __clang__
#if __has_extension(c_atomic)
#include <atomic>
#define CLHEP_ATOMIC_INT_TYPE std::atomic<int>
#else
#define CLHEP_ATOMIC_INT_TYPE int
#endif
#else
#define CLHEP_ATOMIC_INT_TYPE int
#endif
......
Utility/Utility/use_atomic.h
View file @ 605fcddd
......@@ -10,14 +10,9 @@
#if __cplusplus >= 201103L
#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 7) || USING_VISUAL
#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 7) || __clang__ || USING_VISUAL
#include <atomic>
#define CLHEP_USE_ATOMIC
#elif __clang__
#if __has_extension(c_atomic)
#include <atomic>
#define CLHEP_USE_ATOMIC
#endif
#endif
#endif
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment