From 732797c37620a233b0f2d547d588f02c820edea8 Mon Sep 17 00:00:00 2001
From: Nils Krumnack <Nils.Erik.Krumnack@cern.ch>
Date: Wed, 21 Oct 2020 21:46:56 +0200
Subject: [PATCH] remove CLASS_DEF in AsgTools in favor of CLASS_DEF in
xAODCore
So far we had two versions of CLASS_DEF within AnalysisBase, with one
of them actually undefining the other. I now consolidated on just one.
---
.../AsgTools/AsgTools/CLASS_DEF.h | 39 -------------------
Event/xAOD/xAODCore/xAODCore/CLASS_DEF.h | 4 --
2 files changed, 43 deletions(-)
delete mode 100644 Control/AthToolSupport/AsgTools/AsgTools/CLASS_DEF.h
diff --git a/Control/AthToolSupport/AsgTools/AsgTools/CLASS_DEF.h b/Control/AthToolSupport/AsgTools/AsgTools/CLASS_DEF.h
deleted file mode 100644
index 27f312d25c8..00000000000
--- a/Control/AthToolSupport/AsgTools/AsgTools/CLASS_DEF.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
-*/
-
-// David Adams
-// January 2014
-//
-// Wrapper for Athena CLASS_DEF macro.
-// Ignores the macro in other environments.
-//
-// Note that the clid command can be used to generate the class ID:
-// clid -m MyClassName
-
-// Set this flag to show calls to CLASS_DEF in stanadlone environments.
-//#define CLASSDEF_SHOWDEFS
-#ifndef XAOD_STANDALONE
- #undef CLASSDEF_SHOWDEFS
-#endif
-
-#ifdef CLASSDEF_SHOWDEFS
-#include <iostream>
-int announce(const char* name, int clid) {
- std::cout << "*********************** Loading clid for " << name << ": " << clid << std::endl;
- return clid;
-}
-#endif
-
-#ifndef XAOD_STANDALONE
- #include "AthenaKernel/CLASS_DEF.h"
-#else
- #ifdef CLASSDEF_SHOWDEFS
- #define CLASS_DEF(NAME, CLID, VER) int clid_CLASS = announce(#NAME, CLID);
- #else
- // Do not define macro if someone else has already done so.
- #ifndef CLASS_DEF
- #define CLASS_DEF(NAME, CLID, VER)
- #endif
- #endif
-#endif
diff --git a/Event/xAOD/xAODCore/xAODCore/CLASS_DEF.h b/Event/xAOD/xAODCore/xAODCore/CLASS_DEF.h
index e8789630158..45cd2c9bec0 100644
--- a/Event/xAOD/xAODCore/xAODCore/CLASS_DEF.h
+++ b/Event/xAOD/xAODCore/xAODCore/CLASS_DEF.h
@@ -38,10 +38,6 @@
// Include the ClassID_traits class:
#include "xAODCore/ClassID_traits.h"
-// Make sure that we get rid of the definitions from other places.
-// From AsgTools for instance...
-#undef CLASS_DEF
-
// Present a dummy macro to ROOT 6's dictionary generator. Otherwise
// it becomes over-eager, and starts generating dictionaries for types
// that it should just ignore.
--
GitLab