Merge pull request #20022 from mrodozov/cmp-wngs-fix-gcc7-RecoMuon/Mu…

…onIsolation gcc7 compilation warning fix in RecoMuon/MuonIsolation package
cms-sw · Aug 3, 2017 · bde6c50 · bde6c50
2 parents d6c4a99 + f7d6808
commit bde6c50
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/RecoMuon/MuonIsolation/plugins/MuonPFIsolationWithConeVeto.cc b/RecoMuon/MuonIsolation/plugins/MuonPFIsolationWithConeVeto.cc
@@ -59,11 +59,11 @@ bool MuonPFIsolationWithConeVeto::isInIsolationCone(const reco::CandidatePtr& ph
           break;
         }
       }
-      result *= ( is_vertex_allowed );
+      result = result && ( is_vertex_allowed );
     }
-    result *= aspacked->pt() > _vetoThreshold && deltar2 > _vetoConeSize2 && deltar2 < _coneSize2 ;
+    result = result &&( aspacked->pt() > _vetoThreshold && deltar2 > _vetoConeSize2 && deltar2 < _coneSize2 );
   } else if ( aspf.isNonnull() && aspf.get() ) {
-    result *= aspf->pt() > _vetoThreshold && deltar2 > _vetoConeSize2 && deltar2 < _coneSize2 ;
+    result = result && ( aspf->pt() > _vetoThreshold && deltar2 > _vetoConeSize2 && deltar2 < _coneSize2 );
   } else {
     throw cms::Exception("InvalidIsolationInput")
       << "The supplied candidate to be used as isolation "