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

Merge branch 'release/CLHEP_2_4_1_3'

parents 7062c532 daac2fa5
......@@ -49,10 +49,12 @@ public:
// Default constructor. Gives a boost of 0.
inline HepBoostX(const HepBoostX & b);
// Copy constructor.
inline HepBoostX(HepBoostX && b) = default;
// Copy and move constructors.
inline HepBoostX & operator = (const HepBoostX & m);
// Assignment.
inline HepBoostX & operator = (HepBoostX && m) = default;
// Copy and move assignment operators.
HepBoostX & set (double beta);
inline HepBoostX (double beta);
......
......@@ -49,10 +49,12 @@ public:
// Default constructor. Gives a boost of 0.
inline HepBoostY(const HepBoostY & b);
// Copy constructor.
inline HepBoostY(HepBoostY && b) = default;
// Copy and move constructors.
inline HepBoostY & operator = (const HepBoostY & m);
// Assignment.
inline HepBoostY & operator = (HepBoostY && m) = default;
// Copy and move assignment operators.
HepBoostY & set (double beta);
inline HepBoostY (double beta);
......
......@@ -49,10 +49,12 @@ public:
// Default constructor. Gives a boost of 0.
inline HepBoostZ(const HepBoostZ & b);
// Copy constructor.
inline HepBoostZ(HepBoostZ && b) = default;
// Copy and move constructors.
inline HepBoostZ & operator = (const HepBoostZ & m);
// Assignment.
inline HepBoostZ & operator = (HepBoostZ && m) = default;
// Copy and move assignment operators.
HepBoostZ & set (double beta);
inline HepBoostZ (double beta);
......
......@@ -64,7 +64,8 @@ public:
// Default constructor. Gives a unit matrix.
inline HepLorentzRotation (const HepLorentzRotation & r);
// Copy constructor.
inline HepLorentzRotation (HepLorentzRotation && r) = default;
// Copy and move constructors.
inline HepLorentzRotation (const HepRotation & r);
inline explicit HepLorentzRotation (const HepRotationX & r);
......@@ -76,6 +77,7 @@ public:
inline explicit HepLorentzRotation (const HepBoostZ & b);
// Constructors from special cases.
inline HepLorentzRotation & operator = (HepLorentzRotation && m) = default;
inline HepLorentzRotation & operator = (const HepLorentzRotation & m);
inline HepLorentzRotation & operator = (const HepRotation & m);
inline HepLorentzRotation & operator = (const HepBoost & m);
......
......@@ -95,7 +95,8 @@ public:
// Constructor giving a 3-Vector and a time component.
inline HepLorentzVector(const HepLorentzVector &);
// Copy constructor.
inline HepLorentzVector(HepLorentzVector &&) = default;
// Copy and move constructors.
inline ~HepLorentzVector();
// The destructor.
......@@ -154,7 +155,8 @@ public:
// Set components by index.
inline HepLorentzVector & operator = (const HepLorentzVector &);
// Assignment.
inline HepLorentzVector & operator = (HepLorentzVector &&) = default;
// Copy and move assignment operators.
inline HepLorentzVector operator + (const HepLorentzVector &) const;
inline HepLorentzVector & operator += (const HepLorentzVector &);
......
......@@ -55,7 +55,8 @@ public:
// Default constructor. Gives a unit matrix.
inline HepRotation(const HepRotation & m);
// Copy constructor.
inline HepRotation(HepRotation && m) = default;
// Copy and move constructors.
inline HepRotation(const HepRotationX & m);
inline HepRotation(const HepRotationY & m);
......@@ -104,7 +105,8 @@ public:
// set from specialized rotation.
inline HepRotation & operator = (const HepRotation & r);
// Assignment.
inline HepRotation & operator = (HepRotation && r) = default;
// Copy and move assignment operators.
inline HepRotation & operator = (const HepRotationX & r);
inline HepRotation & operator = (const HepRotationY & r);
......
......@@ -54,10 +54,12 @@ public:
// supply angle of rotation
inline HepRotationX(const HepRotationX & orig);
// Copy constructor.
inline HepRotationX(HepRotationX && orig) = default;
// Copy and move constructors.
inline HepRotationX & operator = (const HepRotationX & r);
// Assignment from a Rotation, which must be RotationX
inline HepRotationX & operator = (HepRotationX && r) = default;
// Copy and move assignments from a Rotation, which must be RotationX
HepRotationX & set ( double delta );
// set angle of rotation
......
......@@ -53,10 +53,12 @@ public:
// supply angle of rotation
inline HepRotationY(const HepRotationY & orig);
// Copy constructor.
inline HepRotationY(HepRotationY && orig) = default;
// Copy and move constructors.
inline HepRotationY & operator = (const HepRotationY & r);
// Assignment from a Rotation, which must be RotationY
inline HepRotationY & operator = (HepRotationY && r) = default;
// Copy and move assignments from a Rotation, which must be RotationY
HepRotationY & set ( double delta );
// set angle of rotation
......
......@@ -53,10 +53,12 @@ public:
// supply angle of rotation
inline HepRotationZ(const HepRotationZ & orig);
// Copy constructor.
inline HepRotationZ(HepRotationZ && orig) = default;
// Copy and move constructors.
inline HepRotationZ & operator = (const HepRotationZ & r);
// Assignment from a Rotation, which must be RotationZ
inline HepRotationZ & operator = (HepRotationZ && r) = default;
// Copy and move assignments from a Rotation, which must be RotationZ
HepRotationZ & set ( double delta );
// set angle of rotation
......
......@@ -55,7 +55,8 @@ public:
// The constructor.
inline Hep3Vector(const Hep3Vector &);
// The copy constructor.
inline Hep3Vector(Hep3Vector &&) = default;
// The copy and move constructors.
inline ~Hep3Vector();
// The destructor. Not virtual - inheritance from this class is dangerous.
......@@ -131,7 +132,8 @@ public:
// The transverse component w.r.t. given axis.
inline Hep3Vector & operator = (const Hep3Vector &);
// Assignment.
inline Hep3Vector & operator = (Hep3Vector &&) = default;
// The copy and move assignment operators.
inline bool operator == (const Hep3Vector &) const;
inline bool operator != (const Hep3Vector &) const;
......
......@@ -57,7 +57,8 @@ public:
// The constructor.
inline Hep2Vector(const Hep2Vector & p);
// The copy constructor.
inline Hep2Vector(Hep2Vector && p) = default;
// The copy and move constructors.
explicit Hep2Vector( const Hep3Vector & );
// "demotion" constructor"
......@@ -109,7 +110,8 @@ public:
// Set by polar coordinates.
inline Hep2Vector & operator = (const Hep2Vector & p);
// Assignment.
inline Hep2Vector & operator = (Hep2Vector && p) = default;
// The copy and move assignment operators.
inline bool operator == (const Hep2Vector & v) const;
inline bool operator != (const Hep2Vector & v) const;
......
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