Merge branch 'release/CLHEP_2_4_1_0'

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

ChangeLog

+==============================
+11.06.18 Release CLHEP-2.4.1.0
+==============================
+
+  * various fixes for gcc 8.1.0 support
+  * Vector/src/RotationA.cc: fix a Wshadow problem introduced in 2.3.4.4
+  * Random: add operator double(), which returns flat()
+
 ==============================
 16.03.18 Release CLHEP-2.4.0.4
 ==============================

Evaluator/ChangeLog

 ==============================
+11.06.18 Release CLHEP-2.4.1.0
+==============================
+==============================
 16.03.18 Release CLHEP-2.4.0.4
 ==============================
 ==============================

Exceptions/ChangeLog

+==============================
+11.06.18 Release CLHEP-2.4.1.0
+==============================
+
+  * various fixes for gcc 8.1.0 support
+
 ==============================
 16.03.18 Release CLHEP-2.4.0.4
 ==============================

Exceptions/test/exctest1.cc

@@ -28,10 +28,10 @@ int main()  {
     cerr << "Got past:  ZMthrow( Oops(\"Ouch\") ) -- not good!" << endl;
 #ifndef DEFECT_NO_EXCEPTIONS
   }
-  catch ( const Oops egad )  {
+  catch ( const Oops &egad )  {
     cerr << "Caught:  Oops" << endl;
   }
-  catch ( const ZMexception egad )  {
+  catch ( const ZMexception &egad )  {
     cerr << "Caught:  ZMexception" << endl;
   }
   catch ( ... )  {

Exceptions/test/exctest4.cc

@@ -31,10 +31,10 @@ int main()  {
     cerr << "Got past:  ZMthrow( Oops(\"Ouch\") ) -- not good!" << endl;
 #ifndef DEFECT_NO_EXCEPTIONS
   }
-  catch ( const Oops egad )  {
+  catch ( const Oops &egad )  {
     cerr << "Caught:  Oops" << endl;
   }
-  catch ( const ZMexception egad )  {
+  catch ( const ZMexception &egad )  {
     cerr << "Caught:  ZMexception" << endl;
   }
   catch ( ... )  {

Fields/ChangeLog

 ==============================
+11.06.18 Release CLHEP-2.4.1.0
+==============================
+==============================
 16.03.18 Release CLHEP-2.4.0.4
 ==============================
 ==============================

GenericFunctions/ChangeLog

 ==============================
+11.06.18 Release CLHEP-2.4.1.0
+==============================
+==============================
 16.03.18 Release CLHEP-2.4.0.4
 ==============================
 ==============================

Geometry/ChangeLog

 ==============================
+11.06.18 Release CLHEP-2.4.1.0
+==============================
+==============================
 16.03.18 Release CLHEP-2.4.0.4
 ==============================
 ==============================

Matrix/ChangeLog

 ==============================
+11.06.18 Release CLHEP-2.4.1.0
+==============================
+==============================
 16.03.18 Release CLHEP-2.4.0.4
 ==============================
 ==============================

README.md

@@ -70,13 +70,13 @@ Building CLHEP from Git
 To work with the head:
 
 ```
-$ git clone http://git.cern.ch/pub/CLHEP
+$ git clone https://gitlab.cern.ch/CLHEP/CLHEP.git
 ```
 
 To work with a tag:
 
 ```
-$ git clone http://git.cern.ch/pub/CLHEP
+$ git clone https://gitlab.cern.ch/CLHEP/CLHEP.git
 ... Use "git tag" to see the available tags.
 $ git co <tag>
 ```

Random/ChangeLog

+==============================
+11.06.18 Release CLHEP-2.4.1.0
+==============================
+
+* various fixes for gcc 8.1.0 support
+* add operator double(), which returns flat()
+
 ==============================
 16.03.18 Release CLHEP-2.4.0.4
 ==============================

Random/Random/DualRand.h

@@ -85,7 +85,8 @@ public:
   void showStatus() const;
   // Dumps the current engine status on the screen.
 
-  operator float();      // flat value, without worrying about filling bits
+  operator double();        // Returns same as flat()
+  operator float();         // flat value, without worrying about filling bits
   operator unsigned int();  // 32-bit flat value, quickest of all
 
   virtual std::ostream & put (std::ostream & os) const;

Random/Random/Hurd160Engine.h

@@ -72,8 +72,9 @@ public:
   void showStatus() const;
   // Dumps the engine status on the screen
 
-  operator float();      // flat value, without worrying about filling bits
-  operator unsigned int();  // 32-bit flat value, quickest of all
+  operator double();       // Returns same as flat()
+  operator float();        // flat value, without worrying about filling bits
+  operator unsigned int(); // 32-bit flat value, quickest of all
 
   virtual std::ostream & put (std::ostream & os) const;
   virtual std::istream & get (std::istream & is);

Random/Random/Hurd288Engine.h

@@ -71,8 +71,9 @@ public:
   void showStatus() const;
   // Dumps the engine status on the screen
 
-  operator float();      // flat value, without worrying about filling bits
-  operator unsigned int();  // 32-bit flat value, quickest of all
+  operator double();       // Returns same as flat()
+  operator float();        // flat value, without worrying about filling bits
+  operator unsigned int(); // 32-bit flat value, quickest of all
 
   virtual std::ostream & put (std::ostream & os) const;
   virtual std::istream & get (std::istream & is);

Random/Random/JamesRandom.h

@@ -77,6 +77,10 @@ public:
   void showStatus() const;
   // Dumps the engine status on the screen.
 
+  operator double();
+  // Returns same as flat()
+  operator float();
+  // less precise flat, faster if possible
   operator unsigned int();
   // 32-bit flat, but slower than double or float.
 

Random/Random/MTwistEngine.h

@@ -66,7 +66,8 @@ public:
   void showStatus() const;
   // Dumps the current engine status on the screen.
 
-  operator float();     // returns flat, without worrying about filling bits
+  operator double();       // Returns same as flat()
+  operator float();        // returns flat, without worrying about filling bits
   operator unsigned int(); // 32-bit flat, quickest of all
 
   virtual std::ostream & put (std::ostream & os) const;

Random/Random/MixMaxRng.h

@@ -91,6 +91,10 @@ public:
   void showStatus() const;
   // Dumps the engine status on the screen.
 
+  operator double();
+  // Returns same as flat()
+  operator float();
+  // less precise flat, faster if possible
   operator unsigned int();
   // 32-bit flat
 
@@ -179,7 +183,7 @@ private:
   typedef struct rng_state_st rng_state_t;     // struct alias
   rng_state_t S;
 };
-    
+
 }  // namespace CLHEP
 
 #endif

Random/Random/RandEngine.h

@@ -90,6 +90,8 @@ public:
   void showStatus() const;
   // Dumps the engine status on the screen.
  
+  operator double();       // Returns same as flat()
+  operator float();        // flat value, without worrying about filling bits
   operator unsigned int(); // 32-bit flat value, quickest of all.
 
   virtual std::ostream & put (std::ostream & os) const;

Random/Random/RanecuEngine.h

@@ -85,6 +85,10 @@ public:
   void showStatus() const;
   // Dumps the engine status on the screen.
 
+  operator double();
+  // Returns same as flat()
+  operator float();
+  // less precise flat, faster if possible
   operator unsigned int();
   // 32-bit int flat, faster in this case