diff 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
line wrap: on
line diff
--- a/data/fileio/MatchFileReader.cpp	Tue Jun 03 11:05:49 2014 +0100
+++ b/data/fileio/MatchFileReader.cpp	Wed Jun 18 13:51:16 2014 +0100
@@ -163,8 +163,11 @@
             break;
         }
 
-        if (state < 3) ++state;
-        else if (state == 3 && alignment.thisIndex.size() == count) ++state;
+        if (state < 3) {
+            ++state;
+        } else if (state == 3 && int(alignment.thisIndex.size()) == count) {
+            ++state;
+        }
     }
 
     if (alignment.thisHopTime == 0.0) {