Merge branch 'develop' of https://github.com/ChaiScript/ChaiScript into AddMoreWarningFlags

2015-01-15 15:45:45 -07:00
parent 9449fca22f 5b6e6042f3
commit c7b2b3095a
2 changed files with 5 additions and 5 deletions
--- a/include/chaiscript/dispatchkit/bootstrap_stl.hpp
+++ b/include/chaiscript/dispatchkit/bootstrap_stl.hpp
@@ -574,7 +574,7 @@ namespace chaiscript
        {
          m->add(user_type<FutureType>(), type);

-          m->add(fun(&FutureType::valid), "valid");
+          m->add(fun<bool (const FutureType &)>([](const FutureType &t) { return t.valid(); }), "valid");
          m->add(fun(&FutureType::get), "get");
          m->add(fun(&FutureType::wait), "wait");