generic-library/ChaiScript
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
Conflicts:
	include/chaiscript/dispatchkit/boxed_number.hpp
	include/chaiscript/dispatchkit/dispatchkit.hpp
This commit is contained in:
Jason Turner
2012-05-28 11:42:55 -06:00
parent 13a049cf54 7cbd494123
commit 2969f61fe4
3 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
unittests/eval_catch_exception_test.cpp
View File

@@ -61,7 +61,7 @@ int test_5()
try {
chai.eval("throw(runtime_error(\"error\"))", chaiscript::exception_specification<int, double, float, const std::string &, const std::exception &>());
} catch (const double e) {
} catch (const double) {
std::cout << "test_5 failed with double" << std::endl;
return EXIT_FAILURE;
} catch (int) {
@@ -73,7 +73,7 @@ int test_5()
} catch (const std::string &) {
std::cout << "test_5 failed with string" << std::endl;
return EXIT_FAILURE;
} catch (const std::exception &e) {
} catch (const std::exception &) {
return EXIT_SUCCESS;
}
@@ -96,10 +96,10 @@ int test_unhandled()
} catch (float) {
std::cout << "test_unhandled failed with float" << std::endl;
return EXIT_FAILURE;
} catch (const std::exception &e) {
} catch (const std::exception &) {
std::cout << "test_unhandled failed with std::exception" << std::endl;
return EXIT_FAILURE;
} catch (const chaiscript::Boxed_Value &bv) {
} catch (const chaiscript::Boxed_Value &) {
return EXIT_SUCCESS;
}