From 6018db994c99002105df32b93d7ed1941eeb2f4e Mon Sep 17 00:00:00 2001 From: Piotr Konopka Date: Wed, 24 Jun 2026 16:23:07 +0200 Subject: [PATCH] Mergers: fix duplicated header guards --- Utilities/Mergers/include/Mergers/Mergeable.h | 4 ++-- Utilities/Mergers/include/Mergers/MergerAlgorithm.h | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Utilities/Mergers/include/Mergers/Mergeable.h b/Utilities/Mergers/include/Mergers/Mergeable.h index 60bbf9748bb2a..fea298739c8b6 100644 --- a/Utilities/Mergers/include/Mergers/Mergeable.h +++ b/Utilities/Mergers/include/Mergers/Mergeable.h @@ -9,8 +9,8 @@ // granted to it by virtue of its status as an Intergovernmental Organization // or submit itself to any jurisdiction. -#ifndef ALICEO2_MERGERS_H -#define ALICEO2_MERGERS_H +#ifndef ALICEO2_MERGEABLE_H +#define ALICEO2_MERGEABLE_H /// \file Mergeable.h /// \brief Mergeable concept. diff --git a/Utilities/Mergers/include/Mergers/MergerAlgorithm.h b/Utilities/Mergers/include/Mergers/MergerAlgorithm.h index dd5a632a4ba60..5821e1b700655 100644 --- a/Utilities/Mergers/include/Mergers/MergerAlgorithm.h +++ b/Utilities/Mergers/include/Mergers/MergerAlgorithm.h @@ -9,8 +9,8 @@ // granted to it by virtue of its status as an Intergovernmental Organization // or submit itself to any jurisdiction. -#ifndef ALICEO2_MERGERS_H -#define ALICEO2_MERGERS_H +#ifndef ALICEO2_MERGERALGORITHM_H +#define ALICEO2_MERGERALGORITHM_H /// \file MergerAlgorithm.h /// \brief Algorithms for merging objects. @@ -37,4 +37,4 @@ void deleteTCollections(TObject* obj); } // namespace o2::mergers::algorithm -#endif // ALICEO2_MERGERS_H +#endif // ALICEO2_MERGERALGORITHM_H