Merge branch 'master' into 2010-09-09-CxScript
Conflicts: include/chaiscript/dispatchkit/bad_boxed_cast.hpp
This commit is contained in:
@@ -230,6 +230,7 @@ int main(int argc, char *argv[])
|
||||
case eInteractive : interactive(chai); break;
|
||||
case eCommand : val = chai.eval(arg); break;
|
||||
case eFile : val = chai.eval_file(arg); break;
|
||||
default : std::cout << "Unrecognized execution mode" << std::endl; return EXIT_FAILURE;
|
||||
}
|
||||
}
|
||||
catch (const chaiscript::exception::eval_error &ee) {
|
||||
|
||||
Reference in New Issue
Block a user