--- branches/development/src/selection/SelectionCompiler.cpp 2010/07/09 23:08:25 1465 +++ branches/development/src/selection/SelectionCompiler.cpp 2012/07/06 22:01:58 1767 @@ -36,7 +36,8 @@ * [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). - * [4] Vardeman & Gezelter, in progress (2009). + * [4] Kuang & Gezelter, J. Chem. Phys. 133, 164101 (2010). + * [5] Vardeman, Stocker & Gezelter, J. Chem. Theory Comput. 7, 834 (2011). */ #include "selection/SelectionCompiler.hpp" @@ -440,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; @@ -572,6 +573,7 @@ namespace OpenMD { // fall into the code and below and just add the token case Token::all: case Token::none: + case Token::hull: return addTokenToPostfix(tokenNext()); case Token::leftparen: tokenNext(); @@ -664,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 '[' :