Commit 14236616 authored by Shaun Roe's avatar Shaun Roe Committed by Graeme Stewart
Browse files

Fix low-impact coverity defects (SCT_GeoModel-00-12-06)

	* Fix coverity defects for missing copy, assign on various elements
	  by explicitly forbidding those operations (grep '= delete' to see)
	* Tag as SCT_GeoModel-00-12-06
parent 51703969
......@@ -28,11 +28,13 @@ public:
SCT_FwdModule(const std::string & name, int ringType);
~SCT_FwdModule();
//explicitly disallow copy, assignment to appease coverity
SCT_FwdModule(const SCT_FwdModule &) = delete;
SCT_FwdModule & operator=(const SCT_FwdModule &) = delete;
// Ring type
int ringType() const {return m_ringType;}
//GeoVPhysVol* build(SCT_Identifier id, GeoTransform * position, GeoPhysVol * world) ;
virtual GeoVPhysVol* build(SCT_Identifier id) const;
double stereoAngle() const {return m_stereoAngle;}
......
......@@ -28,6 +28,10 @@ public:
int ec);
~SCT_FwdRing();
//explicitly disallow copy, assignment to appease coverity
SCT_FwdRing(const SCT_FwdRing &) = delete;
SCT_FwdRing & operator=(const SCT_FwdRing &) = delete;
// Ring type
//int ringType() const {return m_ringType;}
......
......@@ -30,6 +30,9 @@ public:
const std::vector<const SCT_FwdModule *> & modules,
int ec);
~SCT_FwdWheel();
//Explicitly disallow copy and assignment to appease coverity
SCT_FwdWheel(const SCT_FwdWheel &) = delete;
SCT_FwdWheel & operator=(const SCT_FwdWheel &) = delete;
int wheelNum() const {return m_iWheel;}
......@@ -63,8 +66,6 @@ private:
int m_numRings;
double m_zPosition;
std::vector<int> m_ringType;
//std::vector<int> m_ringSide;
//std::vector<int> m_ringStereoType;
std::vector<int> m_patchPanelType;
std::vector<double> m_patchPanelLocAngle;
std::vector<bool> m_patchPanelRepeatQuadrant;
......
......@@ -19,6 +19,9 @@ public:
SCT_GeneralParameters();
~SCT_GeneralParameters();
//Explicitly disallow copy, assignment to appease coverity
SCT_GeneralParameters(const SCT_GeneralParameters &) = delete;
SCT_GeneralParameters & operator=(const SCT_GeneralParameters &) = delete;
// General
double safety() const;
......
......@@ -29,6 +29,10 @@ class SCT_InnerSide: public SCT_UniqueComponentFactory
public:
SCT_InnerSide(const std::string & name);
//explicitly disallow copy, assign, to appease coverity
SCT_InnerSide(const SCT_InnerSide &) = delete;
SCT_InnerSide & operator=(const SCT_InnerSide &) = delete;
~SCT_InnerSide();
virtual GeoVPhysVol * build(SCT_Identifier id) const;
......
......@@ -40,6 +40,9 @@ public:
const SCT_Module * module);
~SCT_Layer();
//Explicitly disallow copy, assign to appease coverity
SCT_Layer(const SCT_Layer &) = delete;
SCT_Layer & operator=(const SCT_Layer &) = delete;
virtual GeoVPhysVol * build(SCT_Identifier id) const;
......
......@@ -27,7 +27,11 @@ public:
SCT_Module(const std::string & name);
~SCT_Module();
~SCT_Module();
//Explicitly disallow copy, assign to appease coverity
SCT_Module(const SCT_Module &) = delete;
SCT_Module & operator=(const SCT_Module &) = delete;
virtual GeoVPhysVol * build(SCT_Identifier id) const;
public:
......
......@@ -27,7 +27,10 @@ public:
SCT_OuterSide(const std::string & name);
~SCT_OuterSide();
~SCT_OuterSide();
//Explicitly disallow copy, assign to appease coverity
SCT_OuterSide(const SCT_OuterSide &) = delete;
SCT_OuterSide & operator=(const SCT_OuterSide &) = delete;
virtual GeoVPhysVol * build(SCT_Identifier id) const;
public:
......
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