Skip to content
Snippets Groups Projects
Commit e16190ee authored by Attila Krasznahorkay's avatar Attila Krasznahorkay
Browse files

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.
parent 5084b79a
No related branches found
No related tags found
No related merge requests found
...@@ -91,7 +91,7 @@ namespace CompScaleVar ...@@ -91,7 +91,7 @@ namespace CompScaleVar
{ {
// Error state // Error state
UNKNOWN=0, // Failure/unset/etc UNKNOWN=0, // Failure/unset/etc
// Scale uncertainties // Scale uncertainties
FourVec, // The full jet 4-vector FourVec, // The full jet 4-vector
Pt, // The jet pT Pt, // The jet pT
...@@ -106,7 +106,7 @@ namespace CompScaleVar ...@@ -106,7 +106,7 @@ namespace CompScaleVar
C2Beta1, // The value of C_2^{beta=1} (ECF ratio) C2Beta1, // The value of C_2^{beta=1} (ECF ratio)
Qw, // The value of Qw Qw, // The value of Qw
TagScaleFactor, // Tagging efficiency SF TagScaleFactor, // Tagging efficiency SF
// Resolution uncertainties // Resolution uncertainties
MassRes, // The jet mass resolution, relative MassRes, // The jet mass resolution, relative
MassResAbs, // The jet mass resolution, absolute MassResAbs, // The jet mass resolution, absolute
...@@ -212,6 +212,14 @@ namespace JetTopology ...@@ -212,6 +212,14 @@ namespace JetTopology
TypeEnum stringToEnum(const TString type); 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 namespace ExtendedBool
{ {
enum TypeEnum enum TypeEnum
......
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