diff --git a/ChangeLog b/ChangeLog index 1920d319f4fcb03b938c6c760629af6344e80ccd..c4e8270b3631849e5a0ca6440986524f8d3ea11f 100755 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,11 @@ +2016-11-18 Lynn Garren + + * cmake: Add the ability to build single threaded if desired. + Multihreading remains enabled by default. + Use cmake -DCLHEP_SINGLE_THREAD=ON to disable multithreading. + * Utility/thread_local.h will be generated appropriately + 2016-11-11 Gabriele Cosmo * Random/Random/mixmax.h: corrected value of SPECIALMUL in mixmax.h to correspond to diff --git a/Utility/ChangeLog b/Utility/ChangeLog index 0a10355ff12f6d7ec9c717a11aa3de3bacdd896a..a8d75f0d282af8cf3ab53ca61a75093c557b6908 100755 --- a/Utility/ChangeLog +++ b/Utility/ChangeLog @@ -1,3 +1,9 @@ + +2016-11-18 Lynn Garren + + * Utility/thread_local.h will be generated as part + of enabling either a single or multi threaded build + ============================== 26.08.16 Release CLHEP-2.3.3.2 ============================== diff --git a/Utility/Utility/thread_local.h b/Utility/Utility/thread_local.h deleted file mode 100644 index 87520e6db10f89c6d3114b4d32760a27325e72e2..0000000000000000000000000000000000000000 --- a/Utility/Utility/thread_local.h +++ /dev/null @@ -1,31 +0,0 @@ -#ifndef CLHEP_THREAD_LOCAL_H -#define CLHEP_THREAD_LOCAL_H - -// ====================================================================== -// -// Use thread_local when the compiler declares it uses the C++11 standard -// -// ====================================================================== -#ifdef CLHEP_SINGLE_THREAD - #define CLHEP_THREAD_LOCAL -#else - #if __cplusplus >= 201103L - - #if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 7) - #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 - - #else - #define CLHEP_THREAD_LOCAL - #endif -#endif - -#endif // CLHEP_THREAD_LOCAL_H