Merge pull request #27856 from mrodozov/figxgcc9warns-Reco

Fix gcc9 warnings in Reco
cms-sw · Sep 12, 2019 · 1c708de · 1c708de
2 parents e58d26c + b8a5199
commit 1c708de
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 1 deletion.
diff --git a/RecoCTPPS/TotemRPLocal/src/TotemTimingRecHitProducerAlgorithm.cc b/RecoCTPPS/TotemRPLocal/src/TotemTimingRecHitProducerAlgorithm.cc
@@ -191,5 +191,5 @@ float TotemTimingRecHitProducerAlgorithm::constantFractionDiscriminator(const st
                        (dataProcessed[indexOfThresholdCrossing - 1] - dataProcessed[indexOfThresholdCrossing]) *
                        (threshold - dataProcessed[indexOfThresholdCrossing]) +
                    time[indexOfThresholdCrossing]
-             : TotemTimingRecHit::NO_T_AVAILABLE;
+             : (float)TotemTimingRecHit::NO_T_AVAILABLE;
 }
diff --git a/RecoJets/JetProducers/plugins/InputGenJetsParticleSelector.cc b/RecoJets/JetProducers/plugins/InputGenJetsParticleSelector.cc
@@ -198,6 +198,7 @@ InputGenJetsParticleSelector::ResonanceState InputGenJetsParticleSelector::fromR
           return kDirect;
         if (!isExcludedFromResonance(id))
           break;
+        [[fallthrough]];
       case kIndirect:
         return kIndirect;
     }

diff --git a/RecoJets/JetProducers/src/JetSpecific.cc b/RecoJets/JetProducers/src/JetSpecific.cc
@@ -397,6 +397,7 @@ bool reco::makeSpecific(std::vector<reco::CandidatePtr> const& mcparticles, GenJ
         case 13:  // muon
           genJetSpecific->m_MuonEnergy += e;
           ++(genJetSpecific->m_MuonMultiplicity);
+          break;
         case 211:   //pi+-
         case 321:   //K
         case 2212:  //p

diff --git a/RecoLocalMuon/CSCRecHitD/src/CSCXonStrip_MatchGatti.cc b/RecoLocalMuon/CSCRecHitD/src/CSCXonStrip_MatchGatti.cc
@@ -293,6 +293,7 @@ void CSCXonStrip_MatchGatti::findXOnStrip(const CSCDetId& id,
         noise_level = noise_level_ME1b;
         xt_asymmetry = xt_asymmetry_ME1b;
         const_syst = const_syst_ME1b;
+        break;
 
       case 3:
         noise_level = noise_level_ME12;

diff --git a/RecoMuon/TrackerSeedGenerator/plugins/TSGForRoadSearch.cc b/RecoMuon/TrackerSeedGenerator/plugins/TSGForRoadSearch.cc
@@ -426,6 +426,7 @@ void TSGForRoadSearch::makeSeeds_4(const reco::Track &muon, std::vector<Trajecto
             edm::LogWarning(theCategory) << "ran out of layers to find a seed: no seed.";
             return;
           }
+          break;
         }
         case GeomDetEnumerators::PixelBarrel: {
           edm::LogError(theCategory)