Merge branch 'master' into ChaiScript_5_0_CPP_11

Conflicts: include/chaiscript/dispatchkit/bootstrap.hpp include/chaiscript/dispatchkit/proxy_functions_detail.hpp src/reflection.cpp
2014-02-22 16:41:28 -07:00
parent 20b40d3970 af44da916a
commit 9cf5064a3b
5 changed files with 22 additions and 3 deletions
--- a/include/chaiscript/dispatchkit/bootstrap.hpp
+++ b/include/chaiscript/dispatchkit/bootstrap.hpp
@@ -275,7 +275,11 @@ namespace chaiscript
        auto pf = std::dynamic_pointer_cast<const dispatch::Dynamic_Proxy_Function>(t_pf);
        if (pf)
        {
-          return bool(pf->get_guard());
+          if (pf->get_guard()) {
+            return true;
+          } else {
+            return false;
+          }
        } else {
          return false;
        }