Merge branch 'release-5.x' into develop

2016-10-07 09:13:19 -06:00
parent 7cc100e3d7 665125665a
commit b091439567
8 changed files with 66 additions and 53 deletions
--- a/include/chaiscript/dispatchkit/dispatchkit.hpp
+++ b/include/chaiscript/dispatchkit/dispatchkit.hpp
@@ -450,7 +450,6 @@ namespace chaiscript
        Dispatch_Engine(chaiscript::parser::ChaiScript_Parser_Base &parser)
          : m_stack_holder(this),
            m_parser(parser)
-
        {
        }

@@ -1498,7 +1497,7 @@ namespace chaiscript
        chaiscript::detail::threading::Thread_Storage<Stack_Holder> m_stack_holder;
        std::reference_wrapper<parser::ChaiScript_Parser_Base> m_parser;

-        mutable std::atomic_uint_fast32_t m_method_missing_loc;
+        mutable std::atomic_uint_fast32_t m_method_missing_loc = {0};

        State m_state;
    };