Merge pull request #28943 from vgvassilev/cxxmodules_fix_dataformats_…

…jetreco [cxxmodules] Workaround missing CLHEP modulemap for JetReco.
cms-sw · Feb 14, 2020 · 891e797 · 891e797
2 parents 2a4484e + bcfd273
commit 891e797
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/DataFormats/JetReco/src/classes_3.h b/DataFormats/JetReco/src/classes_3.h
@@ -5,6 +5,12 @@
 
 #include "DataFormats/JetReco/interface/BasicJetCollection.h"
 #include "DataFormats/JetReco/interface/CaloJetCollection.h"
+#if defined __has_feature
+#if __has_feature(modules)
+// Workaround the missing CLHEP.modulemap: CLHEP/Vector/ThreeVector.h:41:7: error: redefinition of 'Hep3Vector'
+#include "DataFormats/JetReco/interface/PFClusterJetCollection.h"
+#endif
+#endif
 #include "DataFormats/JetReco/interface/JPTJetCollection.h"
 #include "DataFormats/JetReco/interface/GenJetCollection.h"
 #include "DataFormats/JetReco/interface/PFJetCollection.h"