--- trunk/src/selection/SelectionCompiler.cpp	2013/12/05 18:19:26	1953
+++ trunk/src/selection/SelectionCompiler.cpp	2015/03/05 16:30:23	2069
@@ -52,12 +52,12 @@ namespace OpenMD {
     lineNumbers.clear();
     lineIndices.clear();
     aatokenCompiled.clear();
-        
+
     if (internalCompile()) {
       return true;
     }
       
-    int icharEnd;
+    std::size_t icharEnd;
     if ((icharEnd = script.find('\r', ichCurrentCommand)) == std::string::npos &&
         (icharEnd = script.find('\n', ichCurrentCommand)) == std::string::npos) {
       icharEnd = script.size();
@@ -374,7 +374,7 @@ namespace OpenMD {
       return false;
     }
     cchToken = ichT - ichToken;
-    return isInteger(script.substr(ichToken, ichT).c_str());
+    return isInteger(script.substr(ichToken, cchToken).c_str());
   }
 
   bool SelectionCompiler::lookingAtLookupToken() {