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

Merge branch 'clang.xAODTrigger-20190208' into 'master'

xAODTrigger: Fix compilation failure with clang.

See merge request atlas/athena!20986
parents 418f3b4a 35d9dd9d
No related branches found
No related tags found
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,!20986xAODTrigger: Fix compilation failure with clang.
......@@ -278,7 +278,6 @@ namespace xAOD {
//
/////////////////////////////////////////////////////////////////////////////
} // namespace xAOD
std::ostream& operator<<(std::ostream& os, const xAOD::TrigComposite_v1& tc) {
os << "TrigComposite_v1 '" << tc.name() << "' link: name, key, index, CLID" << std::endl;
......@@ -290,3 +289,5 @@ std::ostream& operator<<(std::ostream& os, const xAOD::TrigComposite_v1& tc) {
}
return os;
}
} // namespace xAOD
// Dear emacs, this is -*- c++ -*-
/*
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
*/
// $Id: TrigComposite_v1.h 784388 2016-11-15 17:08:58Z tamartin $
......@@ -183,15 +183,15 @@ namespace xAOD {
}; // class TrigComposite_v1
} // namespace xAOD
// Include the template implementation:
#include "TrigComposite_v1.icc"
/**
* @brief print helper for TrigComposite
*/
std::ostream& operator<<(std::ostream& os, const xAOD::TrigComposite_v1& tc);
} // namespace xAOD
// Include the template implementation:
#include "TrigComposite_v1.icc"
#endif // XAODTRIGGER_VERSIONS_TRIGCOMPOSITE_V1_H
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