Skip to content
Snippets Groups Projects
Commit ed9da104 authored by Adam Edward Barton's avatar Adam Edward Barton
Browse files

Merge branch 'clang.IOVSvc-20201116' into 'master'

IOVSvc+EventInfoMgt: Fix clang warnings

See merge request atlas/athena!38314
parents 715804e5 6778702f
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,!38314IOVSvc+EventInfoMgt: Fix clang warnings
......@@ -65,7 +65,7 @@ public:
// unimplemented interfaces
/// Asynchronously setup conditions
virtual ConditionSlotFuture* startConditionSetup(const EventContext&) {
virtual ConditionSlotFuture* startConditionSetup(const EventContext&) override {
return nullptr;
}
......
......@@ -84,29 +84,29 @@ public:
/// @name Basic service methods
//@{
virtual StatusCode initialize();
virtual StatusCode start();
virtual StatusCode finalize();
virtual StatusCode initialize() override;
virtual StatusCode start() override;
virtual StatusCode finalize() override;
/// Query the interfaces.
virtual StatusCode queryInterface( const InterfaceID& riid, void** ppvInterface );
virtual StatusCode queryInterface( const InterfaceID& riid, void** ppvInterface ) override;
//@}
/// @name Interface methods
//@{
/// @name Method to allow clients add in tags as: tag name, tag value
virtual StatusCode addTag(const std::string& tagName,
const std::string& tagValue);
const std::string& tagValue) override;
/// Method to allow clients to remove a tag which may have come in
/// on the input
virtual StatusCode removeTagFromInput(const std::string& tagName);
virtual StatusCode removeTagFromInput(const std::string& tagName) override;
/// Method to allow clients to access the TagInfo object key.
virtual std::string& tagInfoKey();
virtual std::string& tagInfoKey() override;
/// callback from IOVSvc - only used as test of callback
StatusCode checkTagInfo(IOVSVC_CALLBACK_ARGS);
virtual StatusCode checkTagInfo(IOVSVC_CALLBACK_ARGS) override;
//@}
/// Find tag by name, return by value
......@@ -123,7 +123,7 @@ public:
/// Callback at BeginRun and BeginEvent
/// - BeginRun: fill and regsister TagInfo
/// - BeginEvent: fill EventInfo from TagInfo
void handle(const Incident& incident);
virtual void handle(const Incident& incident) override;
typedef IAddressProvider::tadList tadList;
typedef IAddressProvider::tadListIterator tadListIterator;
......@@ -131,17 +131,17 @@ public:
/// preload the detector store with the transient address for
/// TagInfo
virtual StatusCode preLoadAddresses( StoreID::type storeID,
tadList& tlist );
tadList& tlist ) override;
/// Create a TagInfo object and record in storegate
virtual StatusCode updateAddress(StoreID::type storeID, SG::TransientAddress* tad,
const EventContext& ctx);
const EventContext& ctx) override;
/// Implementation of IConverter: Create the transient representation of an object from persistent state.
/// @param pAddress [IN] pointer to IOpaqueAddress of the representation.
/// @param refpObject [OUT] pointer to DataObject to be created.
virtual StatusCode createObj(IOpaqueAddress* pAddress, DataObject*& refpObject);
virtual StatusCode createObj(IOpaqueAddress* pAddress, DataObject*& refpObject) override;
/// Create a Generic address using explicit arguments to identify a single object.
/// @param svcType [IN] service type of the address.
......@@ -153,12 +153,12 @@ public:
const CLID& clid,
const std::string* par,
const unsigned long* ip,
IOpaqueAddress*& refpAddress);
IOpaqueAddress*& refpAddress) override;
/// Convert address to string form
/// @param pAddress [IN] address to be converted.
/// @param refAddress [OUT] converted string form.
virtual StatusCode convertAddress(const IOpaqueAddress* pAddress, std::string& refAddress);
virtual StatusCode convertAddress(const IOpaqueAddress* pAddress, std::string& refAddress) override;
/// Create address from string form
/// @param svcType [IN] service type of the address.
......@@ -168,7 +168,7 @@ public:
virtual StatusCode createAddress(long svcType,
const CLID& clid,
const std::string& refAddress,
IOpaqueAddress*& refpAddress);
IOpaqueAddress*& refpAddress) override;
//@}
///////////////////////////////////////////////////////////////////
......
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