From e16190ee77e3e8c9d5088fedf3f88d155db4a688 Mon Sep 17 00:00:00 2001
From: Attila Krasznahorkay <Attila.Krasznahorkay@cern.ch>
Date: Sat, 26 Dec 2020 17:13:26 +0100
Subject: [PATCH] Unset any custom TRUE or FALSE macros, should they be
defined.
This is necessary on macOS 11, as system headers on that OS do
define these macros for some weird reason.
---
.../JetUncertainties/UncertaintyEnum.h | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/Reconstruction/Jet/JetUncertainties/JetUncertainties/UncertaintyEnum.h b/Reconstruction/Jet/JetUncertainties/JetUncertainties/UncertaintyEnum.h
index 3433aaa688ec..74dea8c24814 100644
--- a/Reconstruction/Jet/JetUncertainties/JetUncertainties/UncertaintyEnum.h
+++ b/Reconstruction/Jet/JetUncertainties/JetUncertainties/UncertaintyEnum.h
@@ -91,7 +91,7 @@ namespace CompScaleVar
{
// Error state
UNKNOWN=0, // Failure/unset/etc
-
+
// Scale uncertainties
FourVec, // The full jet 4-vector
Pt, // The jet pT
@@ -106,7 +106,7 @@ namespace CompScaleVar
C2Beta1, // The value of C_2^{beta=1} (ECF ratio)
Qw, // The value of Qw
TagScaleFactor, // Tagging efficiency SF
-
+
// Resolution uncertainties
MassRes, // The jet mass resolution, relative
MassResAbs, // The jet mass resolution, absolute
@@ -212,6 +212,14 @@ namespace JetTopology
TypeEnum stringToEnum(const TString type);
}
+// Unset the TRUE and FALSE macros, defined in a custom way on macOS 11.
+#ifdef TRUE
+# undef TRUE
+#endif
+#ifdef FALSE
+# undef FALSE
+#endif
+
namespace ExtendedBool
{
enum TypeEnum
--
GitLab