Skip to content

Commit

Permalink
Merge pull request cms-sw#187 from makortel/fixForGCC
Browse files Browse the repository at this point in the history
Fix for gcc
  • Loading branch information
dan131riley committed Feb 28, 2019
2 parents 9920ecc + bc97136 commit 1b6e3d0
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 3 deletions.
2 changes: 1 addition & 1 deletion fittest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ void fitTrack(const Track & trk, const TrackExtra& trkextra, int itrack, Event&
#ifdef INWARDFIT
for (int i = trkLayers.size()-1; i >= 0; i--){
#else
for (int i = 0; i < trkLayers.size(); i++){
for (int i = 0; i < static_cast<int>(trkLayers.size()); i++){
#endif
//for each hit, propagate to hit radius and update track state with hit measurement
const Hit& hit = evt_lay_hits[trkLayers[i]][trk.getHitIdx(trkLayers[i])];
Expand Down
1 change: 0 additions & 1 deletion mkFit/HitStructures.cc
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,6 @@ void LayerOfHits::SuckInHits(const HitVec &hitv)
std::vector<HitInfo> ha(size);
std::vector<udword> hit_qphiFines(size);

int nqh = m_nq / 2;
{
for (int i =0; i < size; ++i)
{
Expand Down
2 changes: 1 addition & 1 deletion mkFit/MkBuilder.h
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ class MkBuilder
int maxN = 0;
int maxL = 0;
for (auto const& lh : m_event_of_hits.m_layers_of_hits){
auto lsize = lh.m_hit_phis.size();
auto lsize = static_cast<int>(lh.m_hit_phis.size());
if (lsize > maxN){
maxN = lsize;
maxL = lh.layer_id();
Expand Down

0 comments on commit 1b6e3d0

Please sign in to comment.