Skip to content
Snippets Groups Projects
Commit 42151dba authored by scott snyder's avatar scott snyder
Browse files

GeoModelSvc: Fix clang warnings.

Missing override keywords,
parent 21a2e761
No related branches found
No related tags found
6 merge requests!58791DataQualityConfigurations: Modify L1Calo config for web display,!46784MuonCondInterface: Enable thread-safety checking.,!46776Updated LArMonitoring config file for WD to match new files produced using MT,!45405updated ART test cron job,!42417Draft: DIRE and VINCIA Base Fragments for Pythia 8.3,!39050GeoModelSvc+MuonMDT_Cabling+MuonCombinedTrackFindingTools+MuonTrackSteeringTools: Fix clang warnings.
...@@ -27,24 +27,24 @@ class GeoModelSvc : public AthService, virtual public IGeoModelSvc, ...@@ -27,24 +27,24 @@ class GeoModelSvc : public AthService, virtual public IGeoModelSvc,
{ {
public: public:
virtual StatusCode initialize(); virtual StatusCode initialize() override;
virtual StatusCode finalize(); virtual StatusCode finalize() override;
// Query the interfaces. // Query the interfaces.
// Input: riid, Requested interface ID // Input: riid, Requested interface ID
// ppvInterface, Pointer to requested interface // ppvInterface, Pointer to requested interface
// Return: StatusCode indicating SUCCESS or FAILURE. // Return: StatusCode indicating SUCCESS or FAILURE.
// N.B. Don't forget to release the interface after use!!! // N.B. Don't forget to release the interface after use!!!
virtual StatusCode queryInterface( const InterfaceID& riid, void** ppvInterface ); virtual StatusCode queryInterface( const InterfaceID& riid, void** ppvInterface ) override;
/// Callback from TagInfoMgr on TagInfo change /// Callback from TagInfoMgr on TagInfo change
virtual void tagInfoUpdated() override final; virtual void tagInfoUpdated() override final;
StatusCode compareTags(); StatusCode compareTags();
virtual const IGeoModelTool* getTool(std::string toolName) const; virtual const IGeoModelTool* getTool(std::string toolName) const override;
virtual StatusCode clear(); virtual StatusCode clear() override;
friend class SvcFactory<GeoModelSvc>; friend class SvcFactory<GeoModelSvc>;
...@@ -98,32 +98,32 @@ private: ...@@ -98,32 +98,32 @@ private:
int m_supportedGeometry; // Supported geometry flag is set in jobOpt and is equal to major release version int m_supportedGeometry; // Supported geometry flag is set in jobOpt and is equal to major release version
bool m_ignoreTagSupport; // If true then don't check SUPPORT flag for ATLAS tag bool m_ignoreTagSupport; // If true then don't check SUPPORT flag for ATLAS tag
const std::string & atlasVersion() const {return m_AtlasVersion; } virtual const std::string & atlasVersion() const override {return m_AtlasVersion; }
const std::string & inDetVersionOverride() const {return m_InDetVersionOverride ;} virtual const std::string & inDetVersionOverride() const override {return m_InDetVersionOverride ;}
const std::string & pixelVersionOverride() const {return m_PixelVersionOverride ;} virtual const std::string & pixelVersionOverride() const override {return m_PixelVersionOverride ;}
const std::string & SCT_VersionOverride() const {return m_SCT_VersionOverride ;} virtual const std::string & SCT_VersionOverride() const override {return m_SCT_VersionOverride ;}
const std::string & TRT_VersionOverride() const {return m_TRT_VersionOverride ;} virtual const std::string & TRT_VersionOverride() const override {return m_TRT_VersionOverride ;}
const std::string & LAr_VersionOverride() const {return m_LAr_VersionOverride ;} virtual const std::string & LAr_VersionOverride() const override {return m_LAr_VersionOverride ;}
const std::string & tileVersionOverride() const {return m_TileVersionOverride ;} virtual const std::string & tileVersionOverride() const override {return m_TileVersionOverride ;}
const std::string & muonVersionOverride() const {return m_MuonVersionOverride ;} virtual const std::string & muonVersionOverride() const override {return m_MuonVersionOverride ;}
const std::string & caloVersionOverride() const {return m_CaloVersionOverride ;} virtual const std::string & caloVersionOverride() const override {return m_CaloVersionOverride ;}
const std::string & magFieldVersionOverride() const {return m_MagFieldVersionOverride ;} virtual const std::string & magFieldVersionOverride() const override {return m_MagFieldVersionOverride ;}
const std::string & cavernInfraVersionOverride() const {return m_CavernInfraVersionOverride ;} virtual const std::string & cavernInfraVersionOverride() const override {return m_CavernInfraVersionOverride ;}
const std::string & forwardDetectorsVersionOverride() const {return m_ForwardDetectorsVersionOverride ;} virtual const std::string & forwardDetectorsVersionOverride() const override {return m_ForwardDetectorsVersionOverride ;}
const std::string & inDetVersion() const {return m_geoDbTagSvc->inDetVersion(); } virtual const std::string & inDetVersion() const override {return m_geoDbTagSvc->inDetVersion(); }
const std::string & pixelVersion() const {return m_geoDbTagSvc->pixelVersion(); } virtual const std::string & pixelVersion() const override {return m_geoDbTagSvc->pixelVersion(); }
const std::string & SCT_Version() const {return m_geoDbTagSvc->SCT_Version(); } virtual const std::string & SCT_Version() const override {return m_geoDbTagSvc->SCT_Version(); }
const std::string & TRT_Version() const {return m_geoDbTagSvc->TRT_Version(); } virtual const std::string & TRT_Version() const override {return m_geoDbTagSvc->TRT_Version(); }
const std::string & LAr_Version() const {return m_geoDbTagSvc->LAr_Version(); } virtual const std::string & LAr_Version() const override {return m_geoDbTagSvc->LAr_Version(); }
const std::string & tileVersion() const {return m_geoDbTagSvc->tileVersion(); } virtual const std::string & tileVersion() const override {return m_geoDbTagSvc->tileVersion(); }
const std::string & muonVersion() const {return m_geoDbTagSvc->muonVersion(); } virtual const std::string & muonVersion() const override {return m_geoDbTagSvc->muonVersion(); }
const std::string & caloVersion() const {return m_geoDbTagSvc->caloVersion(); } virtual const std::string & caloVersion() const override {return m_geoDbTagSvc->caloVersion(); }
const std::string & magFieldVersion() const {return m_geoDbTagSvc->magFieldVersion(); } virtual const std::string & magFieldVersion() const override {return m_geoDbTagSvc->magFieldVersion(); }
const std::string & cavernInfraVersion() const {return m_geoDbTagSvc->cavernInfraVersion(); } virtual const std::string & cavernInfraVersion() const override {return m_geoDbTagSvc->cavernInfraVersion(); }
const std::string & forwardDetectorsVersion() const {return m_geoDbTagSvc->forwardDetectorsVersion(); } virtual const std::string & forwardDetectorsVersion() const override {return m_geoDbTagSvc->forwardDetectorsVersion(); }
GeoModel::GeoConfig geoConfig() const {return m_geoDbTagSvc->geoConfig();} virtual GeoModel::GeoConfig geoConfig() const override {return m_geoDbTagSvc->geoConfig();}
StatusCode geoInit (); StatusCode geoInit ();
StatusCode fillTagInfo() const; StatusCode fillTagInfo() const;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment