Merge pull request #45428 from iarspider/lheinfo-process-compare-early

Fixes for CLANG_X+CPP20

Author: cmsbuild

GeneratorInterface/LHEInterface/src/LHERunInfo.cc

@@ -34,6 +34,13 @@ static int skipWhitespace(std::istream &in) {
 }
 
 namespace lhef {
+  const bool operator==(const LHERunInfo::Process &lhs, const LHERunInfo::Process &rhs) {
+    return (lhs.process() == rhs.process());
+  }
+
+  const bool operator<(const LHERunInfo::Process &lhs, const LHERunInfo::Process &rhs) {
+    return (lhs.process() < rhs.process());
+  }
 
   LHERunInfo::LHERunInfo(std::istream &in) {
     in >> heprup.IDBMUP.first >> heprup.IDBMUP.second >> heprup.EBMUP.first >> heprup.EBMUP.second >>
@@ -528,12 +535,4 @@ namespace lhef {
     return std::make_pair(pdfA, pdfB);
   }
 
-  const bool operator==(const LHERunInfo::Process &lhs, const LHERunInfo::Process &rhs) {
-    return (lhs.process() == rhs.process());
-  }
-
-  const bool operator<(const LHERunInfo::Process &lhs, const LHERunInfo::Process &rhs) {
-    return (lhs.process() < rhs.process());
-  }
-
 }  // namespace lhef

RecoTracker/FinalTrackSelectors/interface/TrackMVAClassifier.h

@@ -1,6 +1,7 @@
 #ifndef RecoTracker_FinalTrackSelectors_TrackMVAClassifierBase_h
 #define RecoTracker_FinalTrackSelectors_TrackMVAClassifierBase_h
 
+#include "DataFormats/TrackReco/interface/Track.h"
 #include "DataFormats/TrackReco/interface/TrackFwd.h"
 #include "DataFormats/VertexReco/interface/VertexFwd.h"
 #include "DataFormats/BeamSpot/interface/BeamSpot.h"