Merge branch 'clang.TrigT1NSWSimTools-20191217' into 'master'

TrigT1NSWSimTools+MMClusterization+MuonMM_CnvTools: Fix clang warnings.

See merge request atlas/athena!28968

MuonSpectrometer/MuonCnv/MuonMM_CnvTools/src/MmRdoToPrepDataTool.h

@@ -51,10 +51,10 @@ namespace Muon
     virtual ~MmRdoToPrepDataTool ();
     
     /** standard Athena-Algorithm method */
-    virtual StatusCode initialize();
+    virtual StatusCode initialize() override;
     
     /** standard Athena-Algorithm method */
-    virtual StatusCode finalize();
+    virtual StatusCode finalize() override;
   
   protected:
     virtual SetupMM_PrepDataContainerStatus setupMM_PrepDataContainer() override;

MuonSpectrometer/MuonCnv/MuonMM_CnvTools/src/MmRdoToPrepDataToolMT.h

@@ -51,10 +51,10 @@ namespace Muon
     virtual ~MmRdoToPrepDataToolMT ();
     
     /** standard Athena-Algorithm method */
-    virtual StatusCode initialize();
+    virtual StatusCode initialize() override;
     
     /** standard Athena-Algorithm method */
-    virtual StatusCode finalize();
+    virtual StatusCode finalize() override;
   
   protected:
     virtual SetupMM_PrepDataContainerStatus setupMM_PrepDataContainer() override;

MuonSpectrometer/MuonReconstruction/MuonDataPrep/MMClusterization/src/ProjectionMMClusterBuilderTool.h

@@ -40,7 +40,8 @@ namespace Muon
     virtual StatusCode initialize() override;
     
     /**Interface fuction to IMMClusterBuilderTool; calling function manages the pointers inside clustersVec  */
-    StatusCode getClusters(std::vector<Muon::MMPrepData>& MMprds, std::vector<Muon::MMPrepData*>& clustersVec);
+    virtual
+    StatusCode getClusters(std::vector<Muon::MMPrepData>& MMprds, std::vector<Muon::MMPrepData*>& clustersVec) override;
 
   private: 
 
@@ -64,4 +65,4 @@ namespace Muon
 
 
 }
-#endif
\ No newline at end of file
+#endif

Trigger/TrigT1/TrigT1NSWSimTools/TrigT1NSWSimTools/PadTdsOfflineTool.h

@@ -70,8 +70,8 @@ namespace NSWL1 {
                         const IInterface* parent);
         virtual ~PadTdsOfflineTool();
         virtual StatusCode initialize() override;
-        virtual void handle (const Incident& inc);
-        StatusCode gather_pad_data(std::vector<std::shared_ptr<PadData>>& pads, int side=-1, int sector=-1);
+        virtual void handle (const Incident& inc) override;
+        virtual StatusCode gather_pad_data(std::vector<std::shared_ptr<PadData>>& pads, int side=-1, int sector=-1) override;
 
     public:
         /** @name Sector indices

Trigger/TrigT1/TrigT1NSWSimTools/TrigT1NSWSimTools/PadTriggerLogicOfflineTool.h

@@ -65,10 +65,11 @@ namespace NSWL1 {
                         const IInterface* parent);
         virtual ~PadTriggerLogicOfflineTool();
         virtual StatusCode initialize() override;
-        virtual void handle (const Incident& inc);
+        virtual void handle (const Incident& inc) override;
         /// Log a message using the Athena controlled logging system
-        
-        StatusCode compute_pad_triggers(const std::vector<std::shared_ptr<PadData>>& pads, std::vector<std::unique_ptr<PadTrigger>> &triggers);
+
+        virtual
+        StatusCode compute_pad_triggers(const std::vector<std::shared_ptr<PadData>>& pads, std::vector<std::unique_ptr<PadTrigger>> &triggers) override;
 
 
         int ROI2BandId(const float &EtaTrigAtCenter, const int &SectorType);//Recipe From Y.R (based on eta slicing of triggering bands see the implementation) 

Trigger/TrigT1/TrigT1NSWSimTools/TrigT1NSWSimTools/PadTriggerLookupTool.h

@@ -51,9 +51,10 @@ namespace NSWL1 {
                         const IInterface* parent);
         virtual ~PadTriggerLookupTool();
         virtual StatusCode initialize() override;
-        virtual void handle (const Incident& inc);
+        virtual void handle (const Incident& inc) override;
+        virtual
         StatusCode lookup_pad_triggers(const std::vector<std::shared_ptr<PadData>>& pads,
-                                       std::vector<std::unique_ptr<PadTrigger>> &triggers);
+                                       std::vector<std::unique_ptr<PadTrigger>> &triggers) override;
     private:
         /// load the 4o4 coincidence table
          StatusCode loadCoincidenceTable(std::string);

Trigger/TrigT1/TrigT1NSWSimTools/TrigT1NSWSimTools/StripClusterTool.h

@@ -63,8 +63,9 @@ namespace NSWL1 {
                       const IInterface* parent);
     virtual ~StripClusterTool();
     virtual StatusCode initialize() override;
-    virtual void handle (const Incident& inc);
-    StatusCode cluster_strip_data( std::vector<std::unique_ptr<StripData>>& strips,std::vector<std::unique_ptr<StripClusterData>>& clusters);
+    virtual void handle (const Incident& inc) override;
+    virtual
+    StatusCode cluster_strip_data( std::vector<std::unique_ptr<StripData>>& strips,std::vector<std::unique_ptr<StripClusterData>>& clusters) override;
   private:
     // methods implementing the internal data processing
 

Trigger/TrigT1/TrigT1NSWSimTools/TrigT1NSWSimTools/StripSegmentTool.h

@@ -54,8 +54,9 @@ namespace NSWL1 {
                       const IInterface* parent);
     virtual ~StripSegmentTool();
     virtual StatusCode initialize() override;
-    virtual void handle (const Incident& inc);
-    StatusCode find_segments( std::vector< std::unique_ptr<StripClusterData> >& ,const std::unique_ptr<Muon::NSW_TrigRawDataContainer>& );
+    virtual void handle (const Incident& inc) override;
+    virtual
+    StatusCode find_segments( std::vector< std::unique_ptr<StripClusterData> >& ,const std::unique_ptr<Muon::NSW_TrigRawDataContainer>& ) override;
 
     
   private:

Trigger/TrigT1/TrigT1NSWSimTools/TrigT1NSWSimTools/StripTdsOfflineTool.h

@@ -73,9 +73,10 @@ namespace NSWL1 {
 
     virtual StatusCode initialize() override;
 
-    virtual void handle (const Incident& inc);
+    virtual void handle (const Incident& inc) override;
 
-    StatusCode gather_strip_data(std::vector<std::unique_ptr<StripData>>& strips,const std::vector<std::unique_ptr<PadTrigger>>& padTriggers);
+    virtual
+    StatusCode gather_strip_data(std::vector<std::unique_ptr<StripData>>& strips,const std::vector<std::unique_ptr<PadTrigger>>& padTriggers) override;
  
 
   private: