diff --git a/include/chaiscript/dispatchkit/bootstrap.hpp b/include/chaiscript/dispatchkit/bootstrap.hpp index 8a5e772..d42baa3 100644 --- a/include/chaiscript/dispatchkit/bootstrap.hpp +++ b/include/chaiscript/dispatchkit/bootstrap.hpp @@ -275,7 +275,11 @@ namespace chaiscript auto pf = std::dynamic_pointer_cast(t_pf); if (pf) { - return bool(pf->get_guard()); + if (pf->get_guard()) { + return true; + } else { + return false; + } } else { return false; } diff --git a/include/chaiscript/dispatchkit/proxy_functions_detail.hpp b/include/chaiscript/dispatchkit/proxy_functions_detail.hpp index d2cdd45..11cda9e 100644 --- a/include/chaiscript/dispatchkit/proxy_functions_detail.hpp +++ b/include/chaiscript/dispatchkit/proxy_functions_detail.hpp @@ -107,6 +107,10 @@ namespace chaiscript +#ifdef BOOST_MSVC +#pragma warning(pop) +#endif + /** * Used by Proxy_Function_Impl to determine if it is equivalent to another * Proxy_Function_Impl object. This function is primarly used to prevent diff --git a/src/main.cpp b/src/main.cpp index 4ef5e2c..a473894 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -67,8 +67,8 @@ std::string default_search_path() return ""; } - #else + std::string exepath; std::vector buf(2048); diff --git a/src/reflection.cpp b/src/reflection.cpp index e08cb7b..7f9f31f 100644 --- a/src/reflection.cpp +++ b/src/reflection.cpp @@ -26,7 +26,12 @@ bool has_parse_tree(const chaiscript::Const_Proxy_Function &t_pf) = std::dynamic_pointer_cast(t_pf); if (pf) { - return bool(pf->get_parse_tree()); + if (pf->get_parse_tree()) + { + return true; + } else { + return false; + } } else { return false; } diff --git a/src/test_module.cpp b/src/test_module.cpp index db8d562..144e8d4 100644 --- a/src/test_module.cpp +++ b/src/test_module.cpp @@ -15,6 +15,9 @@ class TestBaseType int val; const int const_val; + + private: + TestBaseType &operator=(const TestBaseType &); }; enum TestEnum @@ -32,6 +35,9 @@ class TestDerivedType : public TestBaseType public: virtual ~TestDerivedType() {} virtual int func() { return 1; } + + private: + TestDerivedType &operator=(const TestDerivedType &); }; std::string hello_world()