Commit 4a981ab7 authored by Lynn Garren's avatar Lynn Garren
Browse files

Merge branch 'release/CLHEP_2_4_0_4'

parents 1177143b 34e626c4
...@@ -31,7 +31,7 @@ clhep_ensure_out_of_source_build() ...@@ -31,7 +31,7 @@ clhep_ensure_out_of_source_build()
# use cmake 3.2 or later # use cmake 3.2 or later
cmake_minimum_required(VERSION 3.2) cmake_minimum_required(VERSION 3.2)
# Project setup # Project setup
project(CLHEP VERSION 2.4.0.3) project(CLHEP VERSION 2.4.0.4)
# - needed for (temporary) back compatibility # - needed for (temporary) back compatibility
set(VERSION ${PROJECT_VERSION}) set(VERSION ${PROJECT_VERSION})
......
==============================
16.03.18 Release CLHEP-2.4.0.4
==============================
2018-03-16 Lynn Garren <garren@fnal.gov>
* Utility/Utility/use_atomic.h, Utility/Utility/atomic_int.h:
Windows does not recognize the __cplusplus check
============================== ==============================
15.03.18 Release CLHEP-2.4.0.3 15.03.18 Release CLHEP-2.4.0.3
============================== ==============================
......
============================== ==============================
16.03.18 Release CLHEP-2.4.0.4
==============================
==============================
15.03.18 Release CLHEP-2.4.0.3 15.03.18 Release CLHEP-2.4.0.3
============================== ==============================
============================== ==============================
......
============================== ==============================
16.03.18 Release CLHEP-2.4.0.4
==============================
==============================
15.03.18 Release CLHEP-2.4.0.3 15.03.18 Release CLHEP-2.4.0.3
============================== ==============================
============================== ==============================
......
============================== ==============================
16.03.18 Release CLHEP-2.4.0.4
==============================
==============================
15.03.18 Release CLHEP-2.4.0.3 15.03.18 Release CLHEP-2.4.0.3
============================== ==============================
============================== ==============================
......
============================== ==============================
16.03.18 Release CLHEP-2.4.0.4
==============================
==============================
15.03.18 Release CLHEP-2.4.0.3 15.03.18 Release CLHEP-2.4.0.3
============================== ==============================
============================== ==============================
......
============================== ==============================
16.03.18 Release CLHEP-2.4.0.4
==============================
==============================
15.03.18 Release CLHEP-2.4.0.3 15.03.18 Release CLHEP-2.4.0.3
============================== ==============================
============================== ==============================
......
============================== ==============================
16.03.18 Release CLHEP-2.4.0.4
==============================
==============================
15.03.18 Release CLHEP-2.4.0.3 15.03.18 Release CLHEP-2.4.0.3
============================== ==============================
============================== ==============================
......
============================== ==============================
16.03.18 Release CLHEP-2.4.0.4
==============================
==============================
15.03.18 Release CLHEP-2.4.0.3 15.03.18 Release CLHEP-2.4.0.3
============================== ==============================
......
============================== ==============================
16.03.18 Release CLHEP-2.4.0.4
==============================
==============================
15.03.18 Release CLHEP-2.4.0.3 15.03.18 Release CLHEP-2.4.0.3
============================== ==============================
============================== ==============================
......
============================== ==============================
16.03.18 Release CLHEP-2.4.0.4
==============================
==============================
15.03.18 Release CLHEP-2.4.0.3 15.03.18 Release CLHEP-2.4.0.3
============================== ==============================
============================== ==============================
......
==============================
16.03.18 Release CLHEP-2.4.0.4
==============================
2018-03-16 Lynn Garren <garren@fnal.gov>
* Utility/use_atomic.h, Utility/atomic_int.h:
Windows does not recognize the __cplusplus check
============================== ==============================
15.03.18 Release CLHEP-2.4.0.3 15.03.18 Release CLHEP-2.4.0.3
============================== ==============================
......
...@@ -8,17 +8,22 @@ ...@@ -8,17 +8,22 @@
// on macOS, atomic is available starting with Sierra (Darwin 16) // on macOS, atomic is available starting with Sierra (Darwin 16)
// ====================================================================== // ======================================================================
#if __cplusplus >= 201103L #if _WIN32
#include <atomic>
#define CLHEP_ATOMIC_INT_TYPE std::atomic<int>
#else
#if __cplusplus >= 201103L
#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 7) || __clang__ || USING_VISUAL #if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 7) || __clang__
#include <atomic> #include <atomic>
#define CLHEP_ATOMIC_INT_TYPE std::atomic<int> #define CLHEP_ATOMIC_INT_TYPE std::atomic<int>
#else #else
#define CLHEP_ATOMIC_INT_TYPE int #define CLHEP_ATOMIC_INT_TYPE int
#endif #endif
#else #else
#define CLHEP_ATOMIC_INT_TYPE int #define CLHEP_ATOMIC_INT_TYPE int
#endif
#endif #endif
#endif #endif
...@@ -8,13 +8,18 @@ ...@@ -8,13 +8,18 @@
// on macOS, atomic is available starting with Sierra (Darwin 16) // on macOS, atomic is available starting with Sierra (Darwin 16)
// ====================================================================== // ======================================================================
#if __cplusplus >= 201103L #if _WIN32
#include <atomic>
#define CLHEP_USE_ATOMIC
#else
#if __cplusplus >= 201103L
#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 7) || __clang__ || USING_VISUAL #if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 7) || __clang__
#include <atomic> #include <atomic>
#define CLHEP_USE_ATOMIC #define CLHEP_USE_ATOMIC
#endif #endif
#endif
#endif #endif
#endif #endif
============================== ==============================
16.03.18 Release CLHEP-2.4.0.4
==============================
==============================
15.03.18 Release CLHEP-2.4.0.3 15.03.18 Release CLHEP-2.4.0.3
============================== ==============================
============================== ==============================
......
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