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
7a0e4d6d
Commit
7a0e4d6d
authored
Mar 15, 2018
by
Lynn Garren
Browse files
Merge branch 'release/CLHEP_2_4_0_3'
parents
000036b8
d813301a
Changes
17
Hide whitespace changes
Inline
Side-by-side
CMakeLists.txt
View file @
7a0e4d6d
...
...
@@ -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.
2
)
project
(
CLHEP VERSION 2.4.0.
3
)
# - needed for (temporary) back compatibility
set
(
VERSION
${
PROJECT_VERSION
}
)
...
...
ChangeLog
View file @
7a0e4d6d
==============================
15.03.18 Release CLHEP-2.4.0.3
==============================
2018-03-14 Lynn Garren <garren@fnal.gov>
* Utility/Utility/use_atomic.h: allow atomic with Windows VC++
* Utility/Utility/atomic_int.h: allow atomic with Windows VC++
2018-03-14 Gabriele Cosmo <Gabriele.Cosmo@cern.ch>
* cmake/Modules/ClhepVariables.cmake: allow thread local with Windows VC++
* Random/src/Ranlux64Engine.cc: bug fix
==============================
15.02.18 Release CLHEP-2.4.0.2
==============================
...
...
Evaluator/ChangeLog
View file @
7a0e4d6d
==============================
15.03.18 Release CLHEP-2.4.0.3
==============================
==============================
15.02.18 Release CLHEP-2.4.0.2
==============================
==============================
...
...
Exceptions/ChangeLog
View file @
7a0e4d6d
==============================
15.03.18 Release CLHEP-2.4.0.3
==============================
==============================
15.02.18 Release CLHEP-2.4.0.2
==============================
==============================
...
...
Fields/ChangeLog
View file @
7a0e4d6d
==============================
15.03.18 Release CLHEP-2.4.0.3
==============================
==============================
15.02.18 Release CLHEP-2.4.0.2
==============================
==============================
...
...
GenericFunctions/ChangeLog
View file @
7a0e4d6d
==============================
15.03.18 Release CLHEP-2.4.0.3
==============================
==============================
15.02.18 Release CLHEP-2.4.0.2
==============================
==============================
...
...
Geometry/ChangeLog
View file @
7a0e4d6d
==============================
15.03.18 Release CLHEP-2.4.0.3
==============================
==============================
15.02.18 Release CLHEP-2.4.0.2
==============================
==============================
...
...
Matrix/ChangeLog
View file @
7a0e4d6d
==============================
15.03.18 Release CLHEP-2.4.0.3
==============================
==============================
15.02.18 Release CLHEP-2.4.0.2
==============================
==============================
...
...
Random/ChangeLog
View file @
7a0e4d6d
==============================
15.03.18 Release CLHEP-2.4.0.3
==============================
2018-03-14 Gabriele Cosmo <Gabriele.Cosmo@cern.ch>
* src/Ranlux64Engine.cc: bug fix
==============================
15.02.18 Release CLHEP-2.4.0.2
==============================
...
...
Random/src/Ranlux64Engine.cc
View file @
7a0e4d6d
...
...
@@ -423,10 +423,10 @@ void Ranlux64Engine::setSeed(long seed, int lux) {
}
// are we on a 64bit machine?
if
(
sizeof
(
long
)
>=
8
)
{
long
topbits1
,
topbits2
;
int64_t
topbits1
,
topbits2
;
#ifdef USING_VISUAL
topbits1
=
(
seed
>>
32
)
&
0xffff
;
topbits2
=
(
seed
>>
48
)
&
0xffff
;
topbits1
=
(
(
int64_t
)
seed
>>
32
)
&
0xffff
;
topbits2
=
(
(
int64_t
)
seed
>>
48
)
&
0xffff
;
#else
topbits1
=
detail
::
rshift
<
32
>
(
seed
)
&
0xffff
;
topbits2
=
detail
::
rshift
<
48
>
(
seed
)
&
0xffff
;
...
...
RandomObjects/ChangeLog
View file @
7a0e4d6d
==============================
15.03.18 Release CLHEP-2.4.0.3
==============================
==============================
15.02.18 Release CLHEP-2.4.0.2
==============================
==============================
...
...
Units/ChangeLog
View file @
7a0e4d6d
==============================
15.03.18 Release CLHEP-2.4.0.3
==============================
==============================
15.02.18 Release CLHEP-2.4.0.2
==============================
==============================
...
...
Utility/ChangeLog
View file @
7a0e4d6d
==============================
15.03.18 Release CLHEP-2.4.0.3
==============================
2018-03-14 Lynn Garren <garren@fnal.gov>
* Utility/use_atomic.h: allow atomic with Windows VC++
* Utility/atomic_int.h: allow atomic with Windows VC++
==============================
15.02.18 Release CLHEP-2.4.0.2
==============================
...
...
Utility/Utility/atomic_int.h
View file @
7a0e4d6d
...
...
@@ -5,11 +5,12 @@
//
// Use std::atomic when the compiler declares it uses the C++11 standard
//
// on macOS, atomic is available starting with Sierra (Darwin 16)
// ======================================================================
#if __cplusplus >= 201103L
#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 7)
#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 7)
|| USING_VISUAL
#include
<atomic>
#define CLHEP_ATOMIC_INT_TYPE std::atomic<int>
#elif __clang__
...
...
Utility/Utility/use_atomic.h
View file @
7a0e4d6d
...
...
@@ -5,11 +5,12 @@
//
// Use std::atomic when the compiler declares it uses the C++11 standard
//
// on macOS, atomic is available starting with Sierra (Darwin 16)
// ======================================================================
#if __cplusplus >= 201103L
#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 7)
#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 7)
|| USING_VISUAL
#include
<atomic>
#define CLHEP_USE_ATOMIC
#elif __clang__
...
...
Vector/ChangeLog
View file @
7a0e4d6d
==============================
15.03.18 Release CLHEP-2.4.0.3
==============================
==============================
15.02.18 Release CLHEP-2.4.0.2
==============================
==============================
...
...
cmake/Modules/ClhepVariables.cmake
View file @
7a0e4d6d
...
...
@@ -372,9 +372,10 @@ macro( clhep_set_compiler_flags )
if
(
${
CMAKE_BASE_NAME
}
MATCHES
"cl"
)
##message( STATUS "compiler is MSVC" )
##message( STATUS "incoming basic compiler flags are ${CMAKE_CXX_FLAGS}")
set
(
CMAKE_C_FLAGS
"/EHsc /nologo /GR /MD /D USING_VISUAL"
)
set
(
CLHEP_THREAD_DEFINITION
"#define CLHEP_THREAD_LOCAL thread_local"
)
set
(
CMAKE_C_FLAGS
"/EHsc /nologo /GR /MD /D USING_VISUAL"
)
set
(
CMAKE_CXX_FLAGS
"/EHsc /nologo /GR /MD /D USING_VISUAL"
)
set
(
CMAKE_SHARED_LINKER_FLAGS
"/
EHsc /nologo /GR /MD /D USING_VISUAL
"
)
set
(
CMAKE_SHARED_LINKER_FLAGS
"/
nologo
"
)
endif
()
endif
()
clhep_autoconf_variables
()
...
...
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