--- branches/development/src/selection/SelectionCompiler.cpp	2011/11/22 20:38:56	1665
+++ branches/development/src/selection/SelectionCompiler.cpp	2013/05/17 14:41:42	1875
@@ -35,7 +35,7 @@
  *                                                                      
  * [1]  Meineke, et al., J. Comp. Chem. 26, 252-271 (2005).             
  * [2]  Fennell & Gezelter, J. Chem. Phys. 124, 234104 (2006).          
- * [3]  Sun, Lin & Gezelter, J. Chem. Phys. 128, 24107 (2008).          
+ * [3]  Sun, Lin & Gezelter, J. Chem. Phys. 128, 234107 (2008).          
  * [4]  Kuang & Gezelter,  J. Chem. Phys. 133, 164101 (2010).
  * [5]  Vardeman, Stocker & Gezelter, J. Chem. Theory Comput. 7, 834 (2011).
  */
@@ -177,7 +177,7 @@ namespace OpenMD {
 	continue;
       }
 
-      if (ltoken.size() == 0) {
+      if (ltoken.empty()) {
 	return commandExpected();
       }
         
@@ -441,7 +441,7 @@ namespace OpenMD {
 
   bool SelectionCompiler::compileExpression() {
     /** todo */
-    int i = 1;
+    unsigned int i = 1;
     int tokCommand = atokenCommand[0].tok;
     if (tokCommand == Token::define) {
       i = 2;
@@ -666,7 +666,7 @@ namespace OpenMD {
   bool SelectionCompiler::isNameValid(const std::string& name) {
     int nbracket = 0;
     int ndot = 0;
-    for (int i =0 ; i < name.size(); ++i) {
+    for (unsigned int i = 0 ; i < name.size(); ++i) {
       switch(name[i]) {
 
       case '[' :