Commit 000036b8 authored by Lynn Garren's avatar Lynn Garren
Browse files

Merge branch 'release/CLHEP_2_4_0_2'

parents 96dc76ec 172cfe08
...@@ -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.1) project(CLHEP VERSION 2.4.0.2)
# - needed for (temporary) back compatibility # - needed for (temporary) back compatibility
set(VERSION ${PROJECT_VERSION}) set(VERSION ${PROJECT_VERSION})
......
==============================
15.02.18 Release CLHEP-2.4.0.2
==============================
2018-02-15 Lynn Garren <garren@fnal.gov>
* Random/test/testBug58950.cc: bug fix for CLHEP-147
============================== ==============================
11.12.17 Release CLHEP-2.4.0.1 11.12.17 Release CLHEP-2.4.0.1
============================== ==============================
......
============================== ==============================
15.02.18 Release CLHEP-2.4.0.2
==============================
==============================
11.12.17 Release CLHEP-2.4.0.1 11.12.17 Release CLHEP-2.4.0.1
============================== ==============================
============================== ==============================
......
============================== ==============================
15.02.18 Release CLHEP-2.4.0.2
==============================
==============================
11.12.17 Release CLHEP-2.4.0.1 11.12.17 Release CLHEP-2.4.0.1
============================== ==============================
============================== ==============================
......
============================== ==============================
15.02.18 Release CLHEP-2.4.0.2
==============================
==============================
11.12.17 Release CLHEP-2.4.0.1 11.12.17 Release CLHEP-2.4.0.1
============================== ==============================
============================== ==============================
......
============================== ==============================
15.02.18 Release CLHEP-2.4.0.2
==============================
==============================
11.12.17 Release CLHEP-2.4.0.1 11.12.17 Release CLHEP-2.4.0.1
============================== ==============================
============================== ==============================
......
============================== ==============================
15.02.18 Release CLHEP-2.4.0.2
==============================
==============================
11.12.17 Release CLHEP-2.4.0.1 11.12.17 Release CLHEP-2.4.0.1
============================== ==============================
============================== ==============================
......
============================== ==============================
15.02.18 Release CLHEP-2.4.0.2
==============================
==============================
11.12.17 Release CLHEP-2.4.0.1 11.12.17 Release CLHEP-2.4.0.1
============================== ==============================
============================== ==============================
......
==============================
15.02.18 Release CLHEP-2.4.0.2
==============================
2018-02-15 Lynn Garren <garren@fnal.gov>
* test/testBug58950.cc: bug fix for CLHEP-147
============================== ==============================
11.12.17 Release CLHEP-2.4.0.1 11.12.17 Release CLHEP-2.4.0.1
============================== ==============================
......
...@@ -48,10 +48,10 @@ int main() { ...@@ -48,10 +48,10 @@ int main() {
std::ifstream in("/dev/urandom", std::ios::in | std::ios::binary); std::ifstream in("/dev/urandom", std::ios::in | std::ios::binary);
if(in.is_open()) { if(in.is_open()) {
in.read((char *)(&rvals), 2*sizeof(long)); in.read((char *)(&rvals), 2*sizeof(long));
in.close();
if(in.fail()) { if(in.fail()) {
throw std::runtime_error("File read error"); throw std::runtime_error("File read error");
} }
in.close();
} else throw std::runtime_error("File open error"); } else throw std::runtime_error("File open error");
} catch(std::runtime_error e) { } catch(std::runtime_error e) {
std::ostringstream dStr; std::ostringstream dStr;
...@@ -201,7 +201,7 @@ int main() { ...@@ -201,7 +201,7 @@ int main() {
// Loop as long as the values are bad. // Loop as long as the values are bad.
double r; double r;
unsigned int low = ~0; unsigned int low = ~0;
unsigned long mask = (~0) << 31; unsigned long mask = (~0u) << 31;
unsigned long skipcount = 0; unsigned long skipcount = 0;
output << "low = " << low << " mask = " << mask << std::endl; output << "low = " << low << " mask = " << mask << std::endl;
do { do {
......
============================== ==============================
15.02.18 Release CLHEP-2.4.0.2
==============================
==============================
11.12.17 Release CLHEP-2.4.0.1 11.12.17 Release CLHEP-2.4.0.1
============================== ==============================
============================== ==============================
......
============================== ==============================
15.02.18 Release CLHEP-2.4.0.2
==============================
==============================
11.12.17 Release CLHEP-2.4.0.1 11.12.17 Release CLHEP-2.4.0.1
============================== ==============================
============================== ==============================
......
============================== ==============================
15.02.18 Release CLHEP-2.4.0.2
==============================
==============================
11.12.17 Release CLHEP-2.4.0.1 11.12.17 Release CLHEP-2.4.0.1
============================== ==============================
============================== ==============================
......
============================== ==============================
15.02.18 Release CLHEP-2.4.0.2
==============================
==============================
11.12.17 Release CLHEP-2.4.0.1 11.12.17 Release CLHEP-2.4.0.1
============================== ==============================
============================== ==============================
......
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