Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
CLHEP
CLHEP
Commits
4a981ab7
Commit
4a981ab7
authored
Mar 16, 2018
by
Lynn Garren
Browse files
Merge branch 'release/CLHEP_2_4_0_4'
parents
1177143b
34e626c4
Changes
15
Hide whitespace changes
Inline
Side-by-side
CMakeLists.txt
View file @
4a981ab7
...
...
@@ -31,7 +31,7 @@ clhep_ensure_out_of_source_build()
# use cmake 3.2 or later
cmake_minimum_required
(
VERSION 3.2
)
# Project setup
project
(
CLHEP VERSION 2.4.0.
3
)
project
(
CLHEP VERSION 2.4.0.
4
)
# - needed for (temporary) back compatibility
set
(
VERSION
${
PROJECT_VERSION
}
)
...
...
ChangeLog
View file @
4a981ab7
==============================
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
==============================
...
...
Evaluator/ChangeLog
View file @
4a981ab7
==============================
16.03.18 Release CLHEP-2.4.0.4
==============================
==============================
15.03.18 Release CLHEP-2.4.0.3
==============================
==============================
...
...
Exceptions/ChangeLog
View file @
4a981ab7
==============================
16.03.18 Release CLHEP-2.4.0.4
==============================
==============================
15.03.18 Release CLHEP-2.4.0.3
==============================
==============================
...
...
Fields/ChangeLog
View file @
4a981ab7
==============================
16.03.18 Release CLHEP-2.4.0.4
==============================
==============================
15.03.18 Release CLHEP-2.4.0.3
==============================
==============================
...
...
GenericFunctions/ChangeLog
View file @
4a981ab7
==============================
16.03.18 Release CLHEP-2.4.0.4
==============================
==============================
15.03.18 Release CLHEP-2.4.0.3
==============================
==============================
...
...
Geometry/ChangeLog
View file @
4a981ab7
==============================
16.03.18 Release CLHEP-2.4.0.4
==============================
==============================
15.03.18 Release CLHEP-2.4.0.3
==============================
==============================
...
...
Matrix/ChangeLog
View file @
4a981ab7
==============================
16.03.18 Release CLHEP-2.4.0.4
==============================
==============================
15.03.18 Release CLHEP-2.4.0.3
==============================
==============================
...
...
Random/ChangeLog
View file @
4a981ab7
==============================
16.03.18 Release CLHEP-2.4.0.4
==============================
==============================
15.03.18 Release CLHEP-2.4.0.3
==============================
...
...
RandomObjects/ChangeLog
View file @
4a981ab7
==============================
16.03.18 Release CLHEP-2.4.0.4
==============================
==============================
15.03.18 Release CLHEP-2.4.0.3
==============================
==============================
...
...
Units/ChangeLog
View file @
4a981ab7
==============================
16.03.18 Release CLHEP-2.4.0.4
==============================
==============================
15.03.18 Release CLHEP-2.4.0.3
==============================
==============================
...
...
Utility/ChangeLog
View file @
4a981ab7
==============================
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
==============================
...
...
Utility/Utility/atomic_int.h
View file @
4a981ab7
...
...
@@ -8,17 +8,22 @@
// 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>
#define CLHEP_ATOMIC_INT_TYPE std::atomic<int>
#else
#define CLHEP_ATOMIC_INT_TYPE int
#endif
#else
#define CLHEP_ATOMIC_INT_TYPE int
#else
#define CLHEP_ATOMIC_INT_TYPE int
#endif
#endif
#endif
Utility/Utility/use_atomic.h
View file @
4a981ab7
...
...
@@ -8,13 +8,18 @@
// 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>
#define CLHEP_USE_ATOMIC
#endif
#endif
#endif
#endif
Vector/ChangeLog
View file @
4a981ab7
==============================
16.03.18 Release CLHEP-2.4.0.4
==============================
==============================
15.03.18 Release CLHEP-2.4.0.3
==============================
==============================
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment