Merge branch 'release-5.x' into develop

This commit is contained in:
Jason Turner
2016-10-07 09:13:19 -06:00
8 changed files with 66 additions and 53 deletions

View File

@@ -960,7 +960,7 @@ bool FindBitmap(int &ox, int &oy, long) {
TEST_CASE("Mismatched numeric types only convert necessary params")
{
chaiscript::ChaiScript chai;
chaiscript::ChaiScript_Basic chai(create_chaiscript_stdlib(),create_chaiscript_parser());
chai.add(chaiscript::fun(&FindBitmap), "FindBitmap");
int x = 0;
@@ -973,3 +973,13 @@ TEST_CASE("Mismatched numeric types only convert necessary params")
}
TEST_CASE("type_conversion to bool")
{
auto module = std::make_shared<chaiscript::Module>();
struct T {
operator bool() const { return true; }
};
module->add(chaiscript::type_conversion<T, bool>());
}