Merge branch 'clang.MuonMDT_CnvTools-20201120' into 'master'

MuonMDT_CnvTools+MuonRPC_CnvTools+MuonTGC_CnvTools : Fix clang warnings.

See merge request atlas/athena!38481

MuonSpectrometer/MuonCnv/MuonMDT_CnvTools/src/MDT_RawDataProviderTool.h

@@ -33,17 +33,17 @@ class ATLAS_NOT_THREAD_SAFE MDT_RawDataProviderTool : virtual public IMuonRawDat
   virtual ~MDT_RawDataProviderTool ();
     
   /** standard Athena-Algorithm method */
-  virtual StatusCode initialize();
+  virtual StatusCode initialize() override;
     
   /** standard Athena-Algorithm method */
-  virtual StatusCode finalize  ();
+  virtual StatusCode finalize  () override;
   
   /** Convert method - declared in Muon::IMuonRdoToPrepDataTool*/
   virtual StatusCode convert ATLAS_NOT_THREAD_SAFE ( const std::vector<const OFFLINE_FRAGMENTS_NAMESPACE::ROBFragment*>& vecRobs) override;
   virtual StatusCode convert( const std::vector<const OFFLINE_FRAGMENTS_NAMESPACE::ROBFragment*>& vecRobs, const std::vector<IdentifierHash>&) override;
 
   /** the new ones */
-  virtual StatusCode convert(); //!< for the entire event 
+  virtual StatusCode convert() override; //!< for the entire event 
   virtual StatusCode convert(const std::vector<IdentifierHash>& HashVec) override;
   virtual StatusCode convert(const std::vector<uint32_t>& robIds) override;//!< for a particular vector of ROBId's
   /** EventContext ones **/

MuonSpectrometer/MuonCnv/MuonMDT_CnvTools/src/MDT_RawDataProviderToolMT.h

 /*
-  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef MUONMDTCNVTOOLS_MUONMDTRAWDATAPROVIDERTOOLMT_H
@@ -30,18 +30,18 @@ class MDT_RawDataProviderToolMT : virtual public IMuonRawDataProviderTool, publi
     virtual ~MDT_RawDataProviderToolMT () { }
     
   /** standard Athena-Algorithm method */
-  virtual StatusCode initialize();
+  virtual StatusCode initialize() override;
     
   /** standard Athena-Algorithm method */
-  virtual StatusCode finalize  ();
+  virtual StatusCode finalize  () override;
   
   /** Convert method - declared in Muon::IMuonRdoToPrepDataTool*/
-  virtual StatusCode convert( const std::vector<const OFFLINE_FRAGMENTS_NAMESPACE::ROBFragment*>& vecRobs);
-  virtual StatusCode convert( const std::vector<const OFFLINE_FRAGMENTS_NAMESPACE::ROBFragment*>& vecRobs, const std::vector<IdentifierHash>&);
+  virtual StatusCode convert( const std::vector<const OFFLINE_FRAGMENTS_NAMESPACE::ROBFragment*>& vecRobs) override;
+  virtual StatusCode convert( const std::vector<const OFFLINE_FRAGMENTS_NAMESPACE::ROBFragment*>& vecRobs, const std::vector<IdentifierHash>&) override;
   /** the new ones */
-  virtual StatusCode convert(); //!< for the entire event 
-  virtual StatusCode convert(const std::vector<IdentifierHash>& HashVec);
-  virtual StatusCode convert(const std::vector<uint32_t>& robIds);//!< for a particular vector of ROBId's
+  virtual StatusCode convert() override; //!< for the entire event 
+  virtual StatusCode convert(const std::vector<IdentifierHash>& HashVec) override;
+  virtual StatusCode convert(const std::vector<uint32_t>& robIds) override;//!< for a particular vector of ROBId's
   /** EventContext **/
   virtual StatusCode convert( const std::vector<const OFFLINE_FRAGMENTS_NAMESPACE::ROBFragment*>& vecRobs, const EventContext& ctx) const override;
   virtual StatusCode convert( const std::vector<const OFFLINE_FRAGMENTS_NAMESPACE::ROBFragment*>& vecRobs, const std::vector<IdentifierHash>&, const EventContext& ctx) const override;

MuonSpectrometer/MuonCnv/MuonRPC_CnvTools/src/RPC_RawDataProviderTool.h

 /*
-  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef MUONRPCRAWDATAPROVIDERTOOL_H
@@ -34,15 +34,15 @@ class ATLAS_NOT_THREAD_SAFE RPC_RawDataProviderTool : virtual public IMuonRawDat
 
     virtual ~RPC_RawDataProviderTool();
     
-    virtual StatusCode initialize();
+    virtual StatusCode initialize() override;
 
     /** Decoding method. - current methods: let's keep them! */
-    virtual StatusCode convert(const ROBFragmentList& vecRobs);
-    virtual StatusCode convert(const ROBFragmentList& vecRobs, const std::vector<IdentifierHash>& coll);    
+    virtual StatusCode convert(const ROBFragmentList& vecRobs) override;
+    virtual StatusCode convert(const ROBFragmentList& vecRobs, const std::vector<IdentifierHash>& coll) override; 
     /** the new ones */
-    virtual StatusCode convert(); //!< for the entire event 
-    virtual StatusCode convert(const std::vector<IdentifierHash>&); //!< for a selection of rdo collections
-    virtual StatusCode convert(const std::vector<uint32_t>&);
+    virtual StatusCode convert() override; //!< for the entire event 
+    virtual StatusCode convert(const std::vector<IdentifierHash>&) override; //!< for a selection of rdo collections
+    virtual StatusCode convert(const std::vector<uint32_t>&) override;
     /** EventContext ones **/
     virtual StatusCode convert(const ROBFragmentList&, const EventContext&) const override;
     virtual StatusCode convert(const ROBFragmentList&, const std::vector<IdentifierHash>&, const EventContext&) const override;

MuonSpectrometer/MuonCnv/MuonRPC_CnvTools/src/RPC_RawDataProviderToolMT.h

 /*
-  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
 */
 
 #ifndef MUONRPCRAWDATAPROVIDERTOOLMT_H
@@ -37,15 +37,15 @@ class RPC_RawDataProviderToolMT : virtual public IMuonRawDataProviderTool,
 
     virtual ~RPC_RawDataProviderToolMT();
     
-    virtual StatusCode initialize();
+    virtual StatusCode initialize() override;
 
     /** Decoding method. - current methods: let's keep them! */
-    virtual StatusCode convert(const ROBFragmentList& vecRobs);
-    virtual StatusCode convert(const ROBFragmentList& vecRobs, const std::vector<IdentifierHash>& coll);    
+    virtual StatusCode convert(const ROBFragmentList& vecRobs) override;
+    virtual StatusCode convert(const ROBFragmentList& vecRobs, const std::vector<IdentifierHash>& coll) override;
     /** the new ones */
-    virtual StatusCode convert(); //!< for the entire event 
-    virtual StatusCode convert(const std::vector<IdentifierHash>&); //!< for a selection of rdo collections
-    virtual StatusCode convert(const std::vector<uint32_t>&);
+    virtual StatusCode convert() override; //!< for the entire event 
+    virtual StatusCode convert(const std::vector<IdentifierHash>&) override; //!< for a selection of rdo collections
+    virtual StatusCode convert(const std::vector<uint32_t>&) override;
     /** EventContext ones **/
     virtual StatusCode convert(const ROBFragmentList&, const EventContext&) const override;
     virtual StatusCode convert(const ROBFragmentList&, const std::vector<IdentifierHash>&, const EventContext&) const override;

MuonSpectrometer/MuonCnv/MuonTGC_CnvTools/src/TGC_RawDataProviderTool.h

@@ -32,17 +32,17 @@ namespace Muon
       virtual ~TGC_RawDataProviderTool()=default;
       
       /** Standard AlgTool method */
-      virtual StatusCode initialize();
+      virtual StatusCode initialize() override;
       
       /** Old decoding method which uses IROBDataProviderSvc in TgcRdoToPrepDataTool */
-      virtual StatusCode convert(const ROBFragmentList& vecRobs);
+      virtual StatusCode convert(const ROBFragmentList& vecRobs) override;
       /** Old decoding method which uses IROBDataProviderSvc in TgcRdoToPrepDataTool with IdentifierHash vector */
       virtual StatusCode convert(const ROBFragmentList& vecRobs,
-				 const std::vector<IdentifierHash>& rdoIdhVect);
+				 const std::vector<IdentifierHash>& rdoIdhVect) override;
       /** New decoding methods which do not use IROBDataProviderSvc in TgcRdoToPrepDataTool */
-      virtual StatusCode convert();
+      virtual StatusCode convert() override;
       /** New decoding methods which do not use IROBDataProviderSvc in TgcRdoToPrepDataTool with ID Hash vector */
-      virtual StatusCode convert(const std::vector<IdentifierHash>& rdoIdhVect);
+      virtual StatusCode convert(const std::vector<IdentifierHash>& rdoIdhVect) override;
       
       /** EventContext ones **/
       virtual StatusCode convert(const ROBFragmentList&, const EventContext&) const override;
@@ -53,7 +53,7 @@ namespace Muon
     private:
 
       /** convert from vector of ROB IDs is not available */
-      virtual StatusCode convert(const std::vector<uint32_t>&) {return StatusCode::FAILURE;}
+      virtual StatusCode convert(const std::vector<uint32_t>&) override {return StatusCode::FAILURE;}
       /** EventContext ones **/
       virtual StatusCode convert(const std::vector<uint32_t>&, const EventContext&) const override {return StatusCode::FAILURE;}
 

MuonSpectrometer/MuonCnv/MuonTGC_CnvTools/src/TGC_RawDataProviderToolMT.h

@@ -31,17 +31,17 @@ namespace Muon
       virtual ~TGC_RawDataProviderToolMT()=default;
       
       /** Standard AlgTool method */
-      virtual StatusCode initialize();
+      virtual StatusCode initialize() override;
       
       /** Old decoding method which uses IROBDataProviderSvc in TgcRdoToPrepDataTool */
-      virtual StatusCode convert(const ROBFragmentList& vecRobs);
+      virtual StatusCode convert(const ROBFragmentList& vecRobs) override;
       /** Old decoding method which uses IROBDataProviderSvc in TgcRdoToPrepDataTool with IdentifierHash vector */
       virtual StatusCode convert(const ROBFragmentList& vecRobs,
-				 const std::vector<IdentifierHash>& rdoIdhVect);
+				 const std::vector<IdentifierHash>& rdoIdhVect) override;
       /** New decoding methods which do not use IROBDataProviderSvc in TgcRdoToPrepDataTool */
-      virtual StatusCode convert();
+      virtual StatusCode convert() override;
       /** New decoding methods which do not use IROBDataProviderSvc in TgcRdoToPrepDataTool with ID Hash vector */
-      virtual StatusCode convert(const std::vector<IdentifierHash>& rdoIdhVect);
+      virtual StatusCode convert(const std::vector<IdentifierHash>& rdoIdhVect) override;
 
       /** EventContext ones **/
       virtual StatusCode convert(const ROBFragmentList&, const EventContext&) const override;
@@ -54,7 +54,7 @@ namespace Muon
       SG::UpdateHandleKey<TgcRdo_Cache> m_rdoContainerCacheKey ;
 
       /** convert from vector of ROB IDs is not available */
-      virtual StatusCode convert(const std::vector<uint32_t>&) {return StatusCode::FAILURE;}
+      virtual StatusCode convert(const std::vector<uint32_t>&) override {return StatusCode::FAILURE;}
       /** EventContext ones **/
       virtual StatusCode convert(const std::vector<uint32_t>&, const EventContext&) const override {return StatusCode::FAILURE;}