Commit fbebe1bd authored by Lynn Garren's avatar Lynn Garren
Browse files

Merge branch 'release/CLHEP_2_4_1_0'

parents 4a981ab7 e4507ac7
...@@ -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.4) project(CLHEP VERSION 2.4.1.0)
# - needed for (temporary) back compatibility # - needed for (temporary) back compatibility
set(VERSION ${PROJECT_VERSION}) set(VERSION ${PROJECT_VERSION})
......
==============================
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 16.03.18 Release CLHEP-2.4.0.4
============================== ==============================
......
============================== ==============================
11.06.18 Release CLHEP-2.4.1.0
==============================
==============================
16.03.18 Release CLHEP-2.4.0.4 16.03.18 Release CLHEP-2.4.0.4
============================== ==============================
============================== ==============================
......
==============================
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 16.03.18 Release CLHEP-2.4.0.4
============================== ==============================
......
...@@ -28,10 +28,10 @@ int main() { ...@@ -28,10 +28,10 @@ int main() {
cerr << "Got past: ZMthrow( Oops(\"Ouch\") ) -- not good!" << endl; cerr << "Got past: ZMthrow( Oops(\"Ouch\") ) -- not good!" << endl;
#ifndef DEFECT_NO_EXCEPTIONS #ifndef DEFECT_NO_EXCEPTIONS
} }
catch ( const Oops egad ) { catch ( const Oops &egad ) {
cerr << "Caught: Oops" << endl; cerr << "Caught: Oops" << endl;
} }
catch ( const ZMexception egad ) { catch ( const ZMexception &egad ) {
cerr << "Caught: ZMexception" << endl; cerr << "Caught: ZMexception" << endl;
} }
catch ( ... ) { catch ( ... ) {
......
...@@ -31,10 +31,10 @@ int main() { ...@@ -31,10 +31,10 @@ int main() {
cerr << "Got past: ZMthrow( Oops(\"Ouch\") ) -- not good!" << endl; cerr << "Got past: ZMthrow( Oops(\"Ouch\") ) -- not good!" << endl;
#ifndef DEFECT_NO_EXCEPTIONS #ifndef DEFECT_NO_EXCEPTIONS
} }
catch ( const Oops egad ) { catch ( const Oops &egad ) {
cerr << "Caught: Oops" << endl; cerr << "Caught: Oops" << endl;
} }
catch ( const ZMexception egad ) { catch ( const ZMexception &egad ) {
cerr << "Caught: ZMexception" << endl; cerr << "Caught: ZMexception" << endl;
} }
catch ( ... ) { catch ( ... ) {
......
============================== ==============================
11.06.18 Release CLHEP-2.4.1.0
==============================
==============================
16.03.18 Release CLHEP-2.4.0.4 16.03.18 Release CLHEP-2.4.0.4
============================== ==============================
============================== ==============================
......
============================== ==============================
11.06.18 Release CLHEP-2.4.1.0
==============================
==============================
16.03.18 Release CLHEP-2.4.0.4 16.03.18 Release CLHEP-2.4.0.4
============================== ==============================
============================== ==============================
......
============================== ==============================
11.06.18 Release CLHEP-2.4.1.0
==============================
==============================
16.03.18 Release CLHEP-2.4.0.4 16.03.18 Release CLHEP-2.4.0.4
============================== ==============================
============================== ==============================
......
============================== ==============================
11.06.18 Release CLHEP-2.4.1.0
==============================
==============================
16.03.18 Release CLHEP-2.4.0.4 16.03.18 Release CLHEP-2.4.0.4
============================== ==============================
============================== ==============================
......
...@@ -70,13 +70,13 @@ Building CLHEP from Git ...@@ -70,13 +70,13 @@ Building CLHEP from Git
To work with the head: 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: 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. ... Use "git tag" to see the available tags.
$ git co <tag> $ git co <tag>
``` ```
......
==============================
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 16.03.18 Release CLHEP-2.4.0.4
============================== ==============================
......
...@@ -85,6 +85,7 @@ public: ...@@ -85,6 +85,7 @@ public:
void showStatus() const; void showStatus() const;
// Dumps the current engine status on the screen. // Dumps the current engine status on the screen.
operator double(); // Returns same as flat()
operator float(); // flat value, without worrying about filling bits operator float(); // flat value, without worrying about filling bits
operator unsigned int(); // 32-bit flat value, quickest of all operator unsigned int(); // 32-bit flat value, quickest of all
......
...@@ -72,6 +72,7 @@ public: ...@@ -72,6 +72,7 @@ public:
void showStatus() const; void showStatus() const;
// Dumps the engine status on the screen // Dumps the engine status on the screen
operator double(); // Returns same as flat()
operator float(); // flat value, without worrying about filling bits operator float(); // flat value, without worrying about filling bits
operator unsigned int(); // 32-bit flat value, quickest of all operator unsigned int(); // 32-bit flat value, quickest of all
......
...@@ -71,6 +71,7 @@ public: ...@@ -71,6 +71,7 @@ public:
void showStatus() const; void showStatus() const;
// Dumps the engine status on the screen // Dumps the engine status on the screen
operator double(); // Returns same as flat()
operator float(); // flat value, without worrying about filling bits operator float(); // flat value, without worrying about filling bits
operator unsigned int(); // 32-bit flat value, quickest of all operator unsigned int(); // 32-bit flat value, quickest of all
......
...@@ -77,6 +77,10 @@ public: ...@@ -77,6 +77,10 @@ public:
void showStatus() const; void showStatus() const;
// Dumps the engine status on the screen. // Dumps the engine status on the screen.
operator double();
// Returns same as flat()
operator float();
// less precise flat, faster if possible
operator unsigned int(); operator unsigned int();
// 32-bit flat, but slower than double or float. // 32-bit flat, but slower than double or float.
......
...@@ -66,6 +66,7 @@ public: ...@@ -66,6 +66,7 @@ public:
void showStatus() const; void showStatus() const;
// Dumps the current engine status on the screen. // Dumps the current engine status on the screen.
operator double(); // Returns same as flat()
operator float(); // returns flat, without worrying about filling bits operator float(); // returns flat, without worrying about filling bits
operator unsigned int(); // 32-bit flat, quickest of all operator unsigned int(); // 32-bit flat, quickest of all
......
...@@ -91,6 +91,10 @@ public: ...@@ -91,6 +91,10 @@ public:
void showStatus() const; void showStatus() const;
// Dumps the engine status on the screen. // Dumps the engine status on the screen.
operator double();
// Returns same as flat()
operator float();
// less precise flat, faster if possible
operator unsigned int(); operator unsigned int();
// 32-bit flat // 32-bit flat
......
...@@ -90,6 +90,8 @@ public: ...@@ -90,6 +90,8 @@ public:
void showStatus() const; void showStatus() const;
// Dumps the engine status on the screen. // 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. operator unsigned int(); // 32-bit flat value, quickest of all.
virtual std::ostream & put (std::ostream & os) const; virtual std::ostream & put (std::ostream & os) const;
......
...@@ -85,6 +85,10 @@ public: ...@@ -85,6 +85,10 @@ public:
void showStatus() const; void showStatus() const;
// Dumps the engine status on the screen. // Dumps the engine status on the screen.
operator double();
// Returns same as flat()
operator float();
// less precise flat, faster if possible
operator unsigned int(); operator unsigned int();
// 32-bit int flat, faster in this case // 32-bit int flat, faster in this case
......
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