From a56e8afdd80e842ac765775aa8d0b9c85ff25960 Mon Sep 17 00:00:00 2001
From: Jyoti Prakash Biswal <jyoti.prakash.biswal@cern.ch>
Date: Tue, 2 Oct 2018 14:35:11 +0000
Subject: [PATCH] Missing move assignment operator -- fixed! [CID# 113629]
---
.../TrkEventPrimitives/LocalDirection.h | 22 +++++----------
.../TrkEventPrimitives/src/LocalDirection.cxx | 27 -------------------
2 files changed, 7 insertions(+), 42 deletions(-)
diff --git a/Tracking/TrkEvent/TrkEventPrimitives/TrkEventPrimitives/LocalDirection.h b/Tracking/TrkEvent/TrkEventPrimitives/TrkEventPrimitives/LocalDirection.h
index 3219de3b80f..3a850b9062b 100755
--- a/Tracking/TrkEvent/TrkEventPrimitives/TrkEventPrimitives/LocalDirection.h
+++ b/Tracking/TrkEvent/TrkEventPrimitives/TrkEventPrimitives/LocalDirection.h
@@ -70,20 +70,13 @@ namespace Trk {
class LocalDirection {
public:
- /** Default ctor - needed by POOL */
- LocalDirection();
- /** copy constructor */
- LocalDirection(const LocalDirection& err);
-
- /** constructors with parameters */
- LocalDirection(double alphaXZ, double betaYZ);
-
- /** destructor, virtual as other classes may inherit */
- virtual ~LocalDirection();
+ LocalDirection() {};
- /** assignment operator */
- LocalDirection& operator=(const LocalDirection &err);
+ LocalDirection(double axz, double ayz) :
+ m_angleXZ(axz),
+ m_angleYZ(ayz)
+ {}
/** access method for angle of local XZ projection */
const double& angleXZ() const;
@@ -91,10 +84,9 @@ namespace Trk {
/** access method for angle of local YZ projection */
const double& angleYZ() const;
-
protected:
- double m_angleXZ;
- double m_angleYZ;
+ double m_angleXZ = 0.;
+ double m_angleYZ = 0.;
};
diff --git a/Tracking/TrkEvent/TrkEventPrimitives/src/LocalDirection.cxx b/Tracking/TrkEvent/TrkEventPrimitives/src/LocalDirection.cxx
index e1d82dfbf8e..86cfa90f0f4 100755
--- a/Tracking/TrkEvent/TrkEventPrimitives/src/LocalDirection.cxx
+++ b/Tracking/TrkEvent/TrkEventPrimitives/src/LocalDirection.cxx
@@ -10,33 +10,6 @@
//Gaudi
#include "GaudiKernel/MsgStream.h"
-Trk::LocalDirection::LocalDirection() :
- m_angleXZ(0.),
- m_angleYZ(0.)
-{}
-
-Trk::LocalDirection::LocalDirection(double axz, double ayz) :
- m_angleXZ(axz),
- m_angleYZ(ayz)
-{}
-
-Trk::LocalDirection::LocalDirection(const LocalDirection& locdir) :
- m_angleXZ(locdir.m_angleXZ),
- m_angleYZ(locdir.m_angleYZ)
-{}
-
-
-Trk::LocalDirection::~LocalDirection()
-{}
-
-Trk::LocalDirection& Trk::LocalDirection::operator=(const Trk::LocalDirection& rhs)
-{
- if (this != &rhs){
- m_angleXZ = rhs.m_angleXZ;
- m_angleYZ = rhs.m_angleYZ;
- }
- return(*this);
-}
/**Overload of << operator for both, MsgStream and std::ostream for debug output*/
MsgStream& Trk::operator << ( MsgStream& ls, const Trk::LocalDirection& lom)
--
GitLab