Merge branch 'release/CLHEP_2_4_0_2'

CMakeLists.txt

@@ -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.1)
+project(CLHEP VERSION 2.4.0.2)
 # - needed for (temporary) back compatibility
 set(VERSION ${PROJECT_VERSION})
 

ChangeLog

+==============================
+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
 ==============================

Evaluator/ChangeLog

 ==============================
+15.02.18 Release CLHEP-2.4.0.2
+==============================
+==============================
 11.12.17 Release CLHEP-2.4.0.1
 ==============================
 ==============================

Exceptions/ChangeLog

 ==============================
+15.02.18 Release CLHEP-2.4.0.2
+==============================
+==============================
 11.12.17 Release CLHEP-2.4.0.1
 ==============================
 ==============================

Fields/ChangeLog

 ==============================
+15.02.18 Release CLHEP-2.4.0.2
+==============================
+==============================
 11.12.17 Release CLHEP-2.4.0.1
 ==============================
 ==============================

GenericFunctions/ChangeLog

 ==============================
+15.02.18 Release CLHEP-2.4.0.2
+==============================
+==============================
 11.12.17 Release CLHEP-2.4.0.1
 ==============================
 ==============================

Geometry/ChangeLog

 ==============================
+15.02.18 Release CLHEP-2.4.0.2
+==============================
+==============================
 11.12.17 Release CLHEP-2.4.0.1
 ==============================
 ==============================

Matrix/ChangeLog

 ==============================
+15.02.18 Release CLHEP-2.4.0.2
+==============================
+==============================
 11.12.17 Release CLHEP-2.4.0.1
 ==============================
 ==============================

Random/ChangeLog

+==============================
+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
 ==============================

Random/test/testBug58950.cc

@@ -48,10 +48,10 @@ int main() {
 	std::ifstream in("/dev/urandom", std::ios::in | std::ios::binary);
 	if(in.is_open()) {
 		in.read((char *)(&rvals), 2*sizeof(long));
-		in.close();
 		if(in.fail()) {
 			throw std::runtime_error("File read error");
 		}
+		in.close();
 	} else throw std::runtime_error("File open error");
     } catch(std::runtime_error e) {
 	std::ostringstream dStr;
@@ -201,7 +201,7 @@ int main() {
     // Loop as long as the values are bad.
     double r;
     unsigned int low = ~0;
-    unsigned long mask = (~0) << 31;
+    unsigned long mask = (~0u) << 31;
     unsigned long skipcount = 0;
     output << "low = " << low << "  mask = " << mask << std::endl;
     do {

RandomObjects/ChangeLog

 ==============================
+15.02.18 Release CLHEP-2.4.0.2
+==============================
+==============================
 11.12.17 Release CLHEP-2.4.0.1
 ==============================
 ==============================

Units/ChangeLog

 ==============================
+15.02.18 Release CLHEP-2.4.0.2
+==============================
+==============================
 11.12.17 Release CLHEP-2.4.0.1
 ==============================
 ==============================

Utility/ChangeLog

 ==============================
+15.02.18 Release CLHEP-2.4.0.2
+==============================
+==============================
 11.12.17 Release CLHEP-2.4.0.1
 ==============================
 ==============================

Vector/ChangeLog

 ==============================
+15.02.18 Release CLHEP-2.4.0.2
+==============================
+==============================
 11.12.17 Release CLHEP-2.4.0.1
 ==============================
 ==============================