diff --git a/include/chaiscript/dispatchkit/function_call.hpp b/include/chaiscript/dispatchkit/function_call.hpp index 5692e34..c5b950a 100644 --- a/include/chaiscript/dispatchkit/function_call.hpp +++ b/include/chaiscript/dispatchkit/function_call.hpp @@ -40,7 +40,7 @@ namespace chaiscript { const bool has_arity_match = std::any_of(funcs.begin(), funcs.end(), [](const Const_Proxy_Function &f) { - return f->get_arity() == -1 || f->get_arity() == chaiscript::dispatch::detail::Arity::arity; + return f->get_arity() == -1 || size_t(f->get_arity()) == chaiscript::dispatch::detail::Arity::arity; }); if (!has_arity_match) { diff --git a/include/chaiscript/utility/json.hpp b/include/chaiscript/utility/json.hpp index ef3fd34..82a1dac 100644 --- a/include/chaiscript/utility/json.hpp +++ b/include/chaiscript/utility/json.hpp @@ -107,13 +107,13 @@ class JSON JSON() : Internal(), Type( Class::Null ){} explicit JSON(Class type) - : JSON() + : Internal(), Type(Class::Null) { SetType( type ); } JSON( initializer_list list ) - : JSON() + : Internal(), Type(Class::Null) { SetType( Class::Object ); for( auto i = list.begin(), e = list.end(); i != e; ++i, ++i ) @@ -418,7 +418,7 @@ class JSON private: - Class Type = Class::Null; + Class Type; }; JSON Array() { diff --git a/include/chaiscript/utility/json_wrap.hpp b/include/chaiscript/utility/json_wrap.hpp index b7e3ca1..1b0631d 100644 --- a/include/chaiscript/utility/json_wrap.hpp +++ b/include/chaiscript/utility/json_wrap.hpp @@ -32,7 +32,7 @@ namespace chaiscript for (const auto &p : t_json.ObjectRange()) { - m.emplace(p.first, from_json(p.second)); + m.insert(std::make_pair(p.first, from_json(p.second))); } return Boxed_Value(m);