Merge pull request #41458 from smuzaffar/llvm16-enum-fix

Added extra Invalid = -1 enum to avoid llvm16 build errors
cms-sw · Apr 30, 2023 · 86b6f5f · 86b6f5f
2 parents d008462 + 0ef2861
commit 86b6f5f
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/CondFormats/L1TObjects/interface/L1GtDefinitions.h b/CondFormats/L1TObjects/interface/L1GtDefinitions.h
@@ -25,7 +25,7 @@
 #include "DataFormats/L1GlobalTrigger/interface/L1GtDefinitions.h"
 
 /// board types in GT
-enum L1GtBoardType { GTFE, FDL, PSB, GMT, TCS, TIM, BoardNull };
+enum L1GtBoardType { GTFE, FDL, PSB, GMT, TCS, TIM, BoardNull, L1GtBoardTypeInvalid = -1 };
 
 struct L1GtBoardTypeStringToEnum {
   const char* label;
@@ -62,7 +62,8 @@ enum L1GtPsbQuad {
   HfQ,
   BptxQ,
   GtExternalQ,
-  PsbQuadNull
+  PsbQuadNull,
+  L1GtPsbQuadInvalid = -1
 };
 
 struct L1GtPsbQuadStringToEnum {

diff --git a/DataFormats/L1GlobalTrigger/interface/L1GtDefinitions.h b/DataFormats/L1GlobalTrigger/interface/L1GtDefinitions.h
@@ -19,7 +19,8 @@ enum L1GtConditionType {
   TypeHfRingEtSums,
   TypeBptx,
   TypeExternal,
-  Type2corWithOverlapRemoval
+  Type2corWithOverlapRemoval,
+  L1GtConditionTypeInvalid = -1
 };
 
 /// condition categories
@@ -35,7 +36,8 @@ enum L1GtConditionCategory {
   CondHfRingEtSums,
   CondBptx,
   CondExternal,
-  CondCorrelationWithOverlapRemoval
+  CondCorrelationWithOverlapRemoval,
+  L1GtConditionCategoryInvalid = -1
 };
 
 #endif
diff --git a/L1Trigger/L1TGlobal/interface/GlobalDefinitions.h b/L1Trigger/L1TGlobal/interface/GlobalDefinitions.h
@@ -26,7 +26,7 @@
 
 namespace l1t {
   /// board types in GT
-  enum L1GtBoardType { MP7, BoardNull };
+  enum L1GtBoardType { MP7, BoardNull, L1GtBoardTypeInvalid = -1 };
 
   struct L1GtBoardTypeStringToEnum {
     const char* label;
@@ -78,7 +78,8 @@ namespace l1t {
     TypeAsymEt,
     TypeAsymHt,
     TypeAsymEtHF,
-    TypeAsymHtHF
+    TypeAsymHtHF,
+    GtConditionTypeInvalid = -1
   };
 
   struct GtConditionTypeStringToEnum {
@@ -100,6 +101,7 @@ namespace l1t {
     CondCorrelationWithOverlapRemoval,
     CondCorrelationThreeBody,
     CondMuonShower,
+    GtConditionCategoryInvalid = -1
   };
 
   struct GtConditionCategoryStringToEnum {