Skip to content
Snippets Groups Projects
Commit c969f1a3 authored by Frank Winklmeier's avatar Frank Winklmeier
Browse files

Merge branch 'ubsan.TRT_ConditionsServices-20190129' into 'master'

TRT_ConditionsServices: Fix undefined behavior sanitizer warnings.

See merge request !20721
parents f8d039fd 097e9f7e
9 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,!28528Revert 63f845ae,!27054Atr20369 210,!26342Monopole: Handle fractionally charged particles,!20721TRT_ConditionsServices: Fix undefined behavior sanitizer warnings.
/*
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
#ifndef TRT_STRAWSTATUSSUMMARYSVC_H
......@@ -191,7 +191,7 @@ inline void TRT_StrawStatusSummarySvc::setStatus( const TRTCond::ExpandedIdentif
inline const TRT_StrawStatusSummarySvc::StrawStatusContainer* TRT_StrawStatusSummarySvc::getStrawStatusContainer() {
if(m_isGEANT4) {
return &(*m_strawstatusG4);
return m_strawstatusG4.cptr();
}
const EventContext& event_context=Gaudi::Hive::currentContext();
EventContext::ContextID_t slot=event_context.slot();
......@@ -214,7 +214,7 @@ inline const TRT_StrawStatusSummarySvc::StrawStatusContainer* TRT_StrawStatusSum
inline const TRT_StrawStatusSummarySvc::StrawStatusContainer* TRT_StrawStatusSummarySvc::getStrawStatusPermanentContainer() {
if(m_isGEANT4) {
return &(*m_strawstatuspermanentG4);
return m_strawstatuspermanentG4.cptr();
}
const EventContext& event_context=Gaudi::Hive::currentContext();
EventContext::ContextID_t slot=event_context.slot();
......@@ -237,7 +237,7 @@ inline const TRT_StrawStatusSummarySvc::StrawStatusContainer* TRT_StrawStatusSum
inline const TRT_StrawStatusSummarySvc::StrawStatusContainer* TRT_StrawStatusSummarySvc::getStrawStatusHTContainer() {
if(m_isGEANT4) {
return &(*m_strawstatusHTG4);
return m_strawstatusHTG4.cptr();
}
const EventContext& event_context=Gaudi::Hive::currentContext();
EventContext::ContextID_t slot=event_context.slot();
......
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