comparison data/fileio/MatchFileReader.cpp @ 929:59e7fe1b1003 warnfix_no_size_t

Unsigned removals and warning fixes in data/
author Chris Cannam
date Tue, 17 Jun 2014 14:33:42 +0100
parents e802e550a1f2
children 0a35adfb7b16
comparison
equal deleted inserted replaced
928:6a94bb528e9d 929:59e7fe1b1003
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;