Merge branch 'master' into 2010-09-09-CxScript

Conflicts:
	include/chaiscript/dispatchkit/bad_boxed_cast.hpp
This commit is contained in:
Jason Turner
2012-06-01 08:50:15 -06:00
4 changed files with 17 additions and 12 deletions

View File

@@ -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) {