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
9ee1f37b
Commit
9ee1f37b
authored
Mar 16, 2018
by
Lynn Garren
Browse files
make it work on Windows
parent
1177143b
Changes
3
Hide whitespace changes
Inline
Side-by-side
Utility/ChangeLog
View file @
9ee1f37b
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 @
9ee1f37b
...
...
@@ -8,17 +8,22 @@
// on macOS, atomic is available starting with Sierra (Darwin 16)
// ======================================================================
#if __cplusplus >= 201103L
#if USING_VISUAL
#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 @
9ee1f37b
...
...
@@ -8,13 +8,18 @@
// on macOS, atomic is available starting with Sierra (Darwin 16)
// ======================================================================
#if __cplusplus >= 201103L
#if USING_VISUAL
#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
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