Commit 96dc76ec authored by Lynn Garren's avatar Lynn Garren
Browse files

Merge branch 'release/CLHEP_2_4_0_1'

parents e56c9f2b d51e68b8
...@@ -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.0) project(CLHEP VERSION 2.4.0.1)
# - needed for (temporary) back compatibility # - needed for (temporary) back compatibility
set(VERSION ${PROJECT_VERSION}) set(VERSION ${PROJECT_VERSION})
......
==============================
11.12.17 Release CLHEP-2.4.0.1
==============================
2017-12-11 Lynn Garren <garren@fnal.gov>
* Random/src/MixMaxRng.cc: bug fix for CLHEP-146
============================== ==============================
22.11.17 Release CLHEP-2.4.0.0 22.11.17 Release CLHEP-2.4.0.0
============================== ==============================
......
============================== ==============================
11.12.17 Release CLHEP-2.4.0.1
==============================
==============================
22.11.17 Release CLHEP-2.4.0.0 22.11.17 Release CLHEP-2.4.0.0
============================== ==============================
============================== ==============================
......
============================== ==============================
11.12.17 Release CLHEP-2.4.0.1
==============================
==============================
22.11.17 Release CLHEP-2.4.0.0 22.11.17 Release CLHEP-2.4.0.0
============================== ==============================
============================== ==============================
......
============================== ==============================
11.12.17 Release CLHEP-2.4.0.1
==============================
==============================
22.11.17 Release CLHEP-2.4.0.0 22.11.17 Release CLHEP-2.4.0.0
============================== ==============================
============================== ==============================
......
============================== ==============================
11.12.17 Release CLHEP-2.4.0.1
==============================
==============================
22.11.17 Release CLHEP-2.4.0.0 22.11.17 Release CLHEP-2.4.0.0
============================== ==============================
============================== ==============================
......
============================== ==============================
11.12.17 Release CLHEP-2.4.0.1
==============================
==============================
22.11.17 Release CLHEP-2.4.0.0 22.11.17 Release CLHEP-2.4.0.0
============================== ==============================
============================== ==============================
......
============================== ==============================
11.12.17 Release CLHEP-2.4.0.1
==============================
==============================
22.11.17 Release CLHEP-2.4.0.0 22.11.17 Release CLHEP-2.4.0.0
============================== ==============================
============================== ==============================
......
==============================
11.12.17 Release CLHEP-2.4.0.1
==============================
2017-12-11 Lynn Garren <garren@fnal.gov>
* Random/src/MixMaxRng.cc: bug fix for CLHEP-146
============================== ==============================
22.11.17 Release CLHEP-2.4.0.0 22.11.17 Release CLHEP-2.4.0.0
============================== ==============================
......
...@@ -706,7 +706,7 @@ myuint_t MixMaxRng::apply_bigskip( myuint_t* Vout, myuint_t* Vin, myID_t cluster ...@@ -706,7 +706,7 @@ myuint_t MixMaxRng::apply_bigskip( myuint_t* Vout, myuint_t* Vin, myID_t cluster
myuint_t MixMaxRng::modadd(myuint_t foo, myuint_t bar) myuint_t MixMaxRng::modadd(myuint_t foo, myuint_t bar)
{ {
#if (defined(__x86_64__) || defined(__i386__)) && defined(__GNUC__) && (!defined(__ICC)) #if defined(__x86_64__) && defined(__GNUC__) && (!defined(__ICC))
//#warning Using assembler routine in modadd //#warning Using assembler routine in modadd
myuint_t out; myuint_t out;
/* Assembler trick suggested by Andrzej Görlich */ /* Assembler trick suggested by Andrzej Görlich */
......
============================== ==============================
11.12.17 Release CLHEP-2.4.0.1
==============================
==============================
22.11.17 Release CLHEP-2.4.0.0 22.11.17 Release CLHEP-2.4.0.0
============================== ==============================
============================== ==============================
......
============================== ==============================
11.12.17 Release CLHEP-2.4.0.1
==============================
==============================
22.11.17 Release CLHEP-2.4.0.0 22.11.17 Release CLHEP-2.4.0.0
============================== ==============================
============================== ==============================
......
============================== ==============================
11.12.17 Release CLHEP-2.4.0.1
==============================
==============================
22.11.17 Release CLHEP-2.4.0.0 22.11.17 Release CLHEP-2.4.0.0
============================== ==============================
============================== ==============================
......
============================== ==============================
11.12.17 Release CLHEP-2.4.0.1
==============================
==============================
22.11.17 Release CLHEP-2.4.0.0 22.11.17 Release CLHEP-2.4.0.0
============================== ==============================
============================== ==============================
......
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