From 982dfb7c494b77c29456983dfbcc9ce5969efa36 Mon Sep 17 00:00:00 2001
From: Florian Uhlig <f.uhlig@gsi.de>
Date: Fri, 7 May 2021 12:53:31 +0200
Subject: [PATCH] Fix name clash of define statement
When reordering the include statements a name clash between a define statement
in L1 code and a function in Root's TF1.h was found which did not allow to
compile the code.
Rename the define statement such that the name clash is resolved. refs #2051
---
reco/L1/OffLineInterface/CbmL1RichENNRingFinderParallel.cxx | 4 ++--
reco/L1/vectors/P4_F32vec4.h | 4 ++--
reco/L1/vectors/P4_F64vec2.h | 4 ++--
reco/L1/vectors/PSEUDO_F32vec1.h | 4 ++--
reco/L1/vectors/PSEUDO_F32vec4.h | 4 ++--
5 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/reco/L1/OffLineInterface/CbmL1RichENNRingFinderParallel.cxx b/reco/L1/OffLineInterface/CbmL1RichENNRingFinderParallel.cxx
index bb42de5bbd..e52df687f8 100644
--- a/reco/L1/OffLineInterface/CbmL1RichENNRingFinderParallel.cxx
+++ b/reco/L1/OffLineInterface/CbmL1RichENNRingFinderParallel.cxx
@@ -451,7 +451,7 @@ void CbmL1RichENNRingFinderParallel::ENNRingFinder(const int NHits, nsL1vector<E
S4 += w * sHit.S4;
}
- } while (NotEmpty(Dmax > fvec(0.)));
+ } while (NotEmptyFvec(Dmax > fvec(0.)));
#ifdef PRINT_TIMING
@@ -501,7 +501,7 @@ void CbmL1RichENNRingFinderParallel::ENNRingFinder(const int NHits, nsL1vector<E
#ifdef PRINT_TIMING
GetTimer("Ring finding: Store ring").Start(0);
#endif // PRINT_TIMING
- if (ISUNLIKELY(Empty(validRing))) continue;
+ if (ISUNLIKELY(EmptyFvec(validRing))) continue;
///////////
#if 0 // TODO 1
diff --git a/reco/L1/vectors/P4_F32vec4.h b/reco/L1/vectors/P4_F32vec4.h
index 8480de2c53..bef74fab66 100644
--- a/reco/L1/vectors/P4_F32vec4.h
+++ b/reco/L1/vectors/P4_F32vec4.h
@@ -163,8 +163,8 @@ public:
#define if3(a, b, c) ((a) & (b)) | ((!(a)) & (c)) // analog (a) ? b : c
-#define NotEmpty(a) bool((a)[0]) | bool((a)[1]) | bool((a)[2]) | bool((a)[3])
-#define Empty(a) !(bool((a)[0]) | bool((a)[1]) | bool((a)[2]) | bool((a)[3]))
+#define NotEmptyFvec(a) bool((a)[0]) | bool((a)[1]) | bool((a)[2]) | bool((a)[3])
+#define EmptyFvec(a) !(bool((a)[0]) | bool((a)[1]) | bool((a)[2]) | bool((a)[3]))
// bool NotEmpty(const F32vec4 &a) { return a[0]||a[1]||a[2]||a[3]; }
// bool Empty(const F32vec4 &a) { return !(a[0]||a[1]||a[2]||a[3]); } // optimize
friend F32vec4 bool2int(const F32vec4& a) { // mask returned
diff --git a/reco/L1/vectors/P4_F64vec2.h b/reco/L1/vectors/P4_F64vec2.h
index dcef1d6e72..22ffc90a08 100644
--- a/reco/L1/vectors/P4_F64vec2.h
+++ b/reco/L1/vectors/P4_F64vec2.h
@@ -152,8 +152,8 @@ public:
#define if3(a, b, c) ((a) & (b)) | ((!(a)) & (c)) // analog (a) ? b : c
-#define NotEmpty(a) bool((a)[0]) | bool((a)[1]) | bool((a)[2]) | bool((a)[3])
-#define Empty(a) !(bool((a)[0]) | bool((a)[1]) | bool((a)[2]) | bool((a)[3]))
+#define NotEmptyFvec(a) bool((a)[0]) | bool((a)[1]) | bool((a)[2]) | bool((a)[3])
+#define EmptyFvec(a) !(bool((a)[0]) | bool((a)[1]) | bool((a)[2]) | bool((a)[3]))
// bool NotEmpty(const F64vec2 &a) { return a[0]||a[1]||a[2]||a[3]; }
// bool Empty(const F64vec2 &a) { return !(a[0]||a[1]||a[2]||a[3]); } // optimize
friend F64vec2 bool2int(const F64vec2& a) { // mask returned
diff --git a/reco/L1/vectors/PSEUDO_F32vec1.h b/reco/L1/vectors/PSEUDO_F32vec1.h
index 146678b8dc..28badead07 100644
--- a/reco/L1/vectors/PSEUDO_F32vec1.h
+++ b/reco/L1/vectors/PSEUDO_F32vec1.h
@@ -112,8 +112,8 @@ public:
return z;
}
-#define NotEmpty(a) bool((a)[0])
-#define Empty(a) !(bool((a)[0]))
+#define NotEmptyFvec(a) bool((a)[0])
+#define EmptyFvec(a) !(bool((a)[0]))
friend F32vec1 bool2int(const F32vec1& a) { // mask returned
return if3(a, 1, 0);
}
diff --git a/reco/L1/vectors/PSEUDO_F32vec4.h b/reco/L1/vectors/PSEUDO_F32vec4.h
index cda7ac4b9e..606fc3dc9f 100644
--- a/reco/L1/vectors/PSEUDO_F32vec4.h
+++ b/reco/L1/vectors/PSEUDO_F32vec4.h
@@ -115,8 +115,8 @@ public:
return z;
}
-#define NotEmpty(a) bool((a)[0]) | bool((a)[1]) | bool((a)[2]) | bool((a)[3])
-#define Empty(a) !(bool((a)[0]) | bool((a)[1]) | bool((a)[2]) | bool((a)[3]))
+#define NotEmptyFvec(a) bool((a)[0]) | bool((a)[1]) | bool((a)[2]) | bool((a)[3])
+#define EmptyFvec(a) !(bool((a)[0]) | bool((a)[1]) | bool((a)[2]) | bool((a)[3]))
// bool NotEmpty(const F32vec4 &a) { return a[0]||a[1]||a[2]||a[3]; }
// bool Empty(const F32vec4 &a) { return !(a[0]||a[1]||a[2]||a[3]); } // optimize
friend F32vec4 bool2int(const F32vec4& a) { // mask returned
--
GitLab