From 6cff67dafb7435455243610f7faf2bc1a6245ba3 Mon Sep 17 00:00:00 2001
From: scott snyder <snyder@bnl.gov>
Date: Thu, 21 May 2020 16:28:32 +0200
Subject: [PATCH] TrkExAlgs: Fix compilation with clang.
Gaudi property conversion.
Missing override keyword.
---
.../TrkExAlgs/TrkExAlgs/PropResultRootWriterSvc.h | 2 +-
.../TrkExtrapolation/TrkExAlgs/src/PropResultRootWriterSvc.cxx | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Tracking/TrkExtrapolation/TrkExAlgs/TrkExAlgs/PropResultRootWriterSvc.h b/Tracking/TrkExtrapolation/TrkExAlgs/TrkExAlgs/PropResultRootWriterSvc.h
index edbc78a276b..420ca7a2f2f 100644
--- a/Tracking/TrkExtrapolation/TrkExAlgs/TrkExAlgs/PropResultRootWriterSvc.h
+++ b/Tracking/TrkExtrapolation/TrkExAlgs/TrkExAlgs/PropResultRootWriterSvc.h
@@ -33,7 +33,7 @@ class PropResultRootWriterSvc : public AthService {
return IID_PropResultRootWriterSvc;
}
- virtual StatusCode queryInterface(const InterfaceID& riid, void** ppvInterface) {
+ virtual StatusCode queryInterface(const InterfaceID& riid, void** ppvInterface) override {
ATH_MSG_DEBUG("in queryInterface()");
if (PropResultRootWriterSvc::interfaceID().versionMatch(riid)) {
ATH_MSG_DEBUG("matched PropResultRootWriterSvc");
diff --git a/Tracking/TrkExtrapolation/TrkExAlgs/src/PropResultRootWriterSvc.cxx b/Tracking/TrkExtrapolation/TrkExAlgs/src/PropResultRootWriterSvc.cxx
index a9905d4a8f9..1a3d6ba489e 100644
--- a/Tracking/TrkExtrapolation/TrkExAlgs/src/PropResultRootWriterSvc.cxx
+++ b/Tracking/TrkExtrapolation/TrkExAlgs/src/PropResultRootWriterSvc.cxx
@@ -29,7 +29,7 @@ StatusCode Trk::PropResultRootWriterSvc::initialize()
const std::string treeName = m_treeName;
m_tree = new TTree(treeName.data(), "MyStudies");
- std::string fullNtupleName = m_ntupleDirName + m_treeName;
+ std::string fullNtupleName = static_cast<std::string>(m_ntupleDirName) + m_treeName;
CHECK(m_thistSvc->regTree(fullNtupleName, m_tree));
if(m_tree == nullptr) {
--
GitLab