Mercurial > hg > svcore
comparison data/fileio/MatchFileReader.cpp @ 936:0c1d6de8f44b
Merge from branch warnfix_no_size_t
author | Chris Cannam |
---|---|
date | Wed, 18 Jun 2014 13:51:16 +0100 |
parents | 59e7fe1b1003 |
children | 0a35adfb7b16 |
comparison
equal
deleted
inserted
replaced
917:49618f39ff09 | 936:0c1d6de8f44b |
---|---|
161 case 4: | 161 case 4: |
162 alignment.refIndex.push_back(line.toInt()); | 162 alignment.refIndex.push_back(line.toInt()); |
163 break; | 163 break; |
164 } | 164 } |
165 | 165 |
166 if (state < 3) ++state; | 166 if (state < 3) { |
167 else if (state == 3 && alignment.thisIndex.size() == count) ++state; | 167 ++state; |
168 } else if (state == 3 && int(alignment.thisIndex.size()) == count) { | |
169 ++state; | |
170 } | |
168 } | 171 } |
169 | 172 |
170 if (alignment.thisHopTime == 0.0) { | 173 if (alignment.thisHopTime == 0.0) { |
171 cerr << "ERROR in Match file: this hop time == 0, using 0.01 instead" << endl; | 174 cerr << "ERROR in Match file: this hop time == 0, using 0.01 instead" << endl; |
172 alignment.thisHopTime = 0.01; | 175 alignment.thisHopTime = 0.01; |