Import Geant4 10.5.0.beta source tree
This commit is contained in:
@@ -7,18 +7,11 @@
|
||||
//
|
||||
// ======================================================================
|
||||
|
||||
#if (defined (G4MULTITHREADED))
|
||||
#if defined (G4MULTITHREADED)
|
||||
|
||||
#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 7)
|
||||
#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 7) || __clang__ || WIN32
|
||||
#include <atomic>
|
||||
#define CLHEP_ATOMIC_INT_TYPE std::atomic<int>
|
||||
#elif __clang__
|
||||
#if __has_feature(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
|
||||
|
||||
@@ -7,16 +7,10 @@
|
||||
//
|
||||
// ======================================================================
|
||||
|
||||
#if (defined (G4MULTITHREADED) && defined (G4USE_STD11))
|
||||
#if defined (G4MULTITHREADED)
|
||||
|
||||
#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 7)
|
||||
#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 7) || __clang__ || WIN32
|
||||
#define CLHEP_THREAD_LOCAL thread_local
|
||||
#elif __clang__
|
||||
#if __has_feature(cxx_thread_local)
|
||||
#define CLHEP_THREAD_LOCAL thread_local
|
||||
#else
|
||||
#define CLHEP_THREAD_LOCAL
|
||||
#endif
|
||||
#else
|
||||
#define CLHEP_THREAD_LOCAL
|
||||
#endif
|
||||
|
||||
+2
-11
@@ -7,22 +7,13 @@
|
||||
//
|
||||
// ======================================================================
|
||||
|
||||
#if (defined (G4MULTITHREADED))
|
||||
#if defined (G4MULTITHREADED)
|
||||
|
||||
#if __cplusplus >= 201103L
|
||||
|
||||
#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 7)
|
||||
#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 7) || __clang__ || WIN32
|
||||
#include <atomic>
|
||||
#define CLHEP_USE_ATOMIC
|
||||
#elif __clang__
|
||||
#if __has_feature(c_atomic)
|
||||
#include <atomic>
|
||||
#define CLHEP_USE_ATOMIC
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user