ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/OpenMD/trunk/src/selection/SelectionEvaluator.cpp
(Generate patch)

Comparing trunk/src/selection/SelectionEvaluator.cpp (file contents):
Revision 295 by tim, Mon Feb 7 19:13:18 2005 UTC vs.
Revision 351 by tim, Tue Feb 15 19:36:07 2005 UTC

# Line 102 | Line 102 | bool SelectionEvaluator::loadScriptFileInternal(const
102   }
103  
104   bool SelectionEvaluator::loadScriptFileInternal(const  std::string & filename) {
105 <    ifstream ifs(filename.c_str());
105 >  std::ifstream ifs(filename.c_str());
106      if (!ifs.is_open()) {
107          return false;
108      }
# Line 300 | Line 300 | void SelectionEvaluator::define() {
300  
301      std::string variable = boost::any_cast<std::string>(statement[1].value);
302  
303 <    variables.insert(std::make_pair(variable, expression(statement, 2)));
303 >    variables.insert(VariablesType::value_type(variable, expression(statement, 2)));
304   }
305  
306  
# Line 319 | Line 319 | void SelectionEvaluator::predefine(const std::string&
319              int tok = statement[1].tok;
320              if (tok == Token::identifier || (tok & Token::predefinedset) == Token::predefinedset) {
321                  std::string variable = boost::any_cast<std::string>(statement[1].value);
322 <                variables.insert(std::make_pair(variable, statement));
322 >                variables.insert(VariablesType::value_type(variable, statement));
323  
324              } else {
325                  evalError("invalid variable name:" + script);
# Line 386 | Line 386 | BitSet SelectionEvaluator::evaluate() {
386   BitSet SelectionEvaluator::evaluate() {
387      BitSet bs(nStuntDouble);
388      if (isLoaded_) {
389 +        pc = 0;
390          instructionDispatchLoop(bs);
391      }
392  

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines