coffee/ChaiScript
1
0
Fork 0
mirror of https://github.com/ChaiScript/ChaiScript.git synced 2025-12-06 08:46:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix vs2019 build

Browse Source
This commit is contained in:
Bernd Amend 2021-05-22 23:53:31 +02:00
parent 4ec767bdc9
commit 82ef037912
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
include/chaiscript/dispatchkit/dynamic_object_detail.hpp
View File

@ -83,7 +83,7 @@ namespace chaiscript
bool is_attribute_function() const noexcept override { return m_is_attribute; } bool is_attribute_function() const noexcept override { return m_is_attribute; }
bool call_match(const Function_Params &vals, const Type_Conversions_State &t_conversions) const noexcept override bool call_match(const chaiscript::Function_Params &vals, const Type_Conversions_State &t_conversions) const noexcept override
{ {
if (dynamic_object_typename_match(vals, m_type_name, m_ti, t_conversions)) if (dynamic_object_typename_match(vals, m_type_name, m_ti, t_conversions))
{ {
@ -99,7 +99,7 @@ namespace chaiscript
} }
protected: protected:
Boxed_Value do_call(const Function_Params &params, const Type_Conversions_State &t_conversions) const override Boxed_Value do_call(const chaiscript::Function_Params &params, const Type_Conversions_State &t_conversions) const override
{ {
if (dynamic_object_typename_match(params, m_type_name, m_ti, t_conversions)) if (dynamic_object_typename_match(params, m_type_name, m_ti, t_conversions))
{ {
@ -148,7 +148,7 @@ namespace chaiscript
} }
bool dynamic_object_typename_match(const Function_Params &bvs, const std::string &name, bool dynamic_object_typename_match(const chaiscript::Function_Params &bvs, const std::string &name,
const std::unique_ptr<Type_Info> &ti, const Type_Conversions_State &t_conversions) const noexcept const std::unique_ptr<Type_Info> &ti, const Type_Conversions_State &t_conversions) const noexcept
{ {
if (!bvs.empty()) if (!bvs.empty())
@ -205,22 +205,22 @@ namespace chaiscript
return (dc != nullptr) && dc->m_type_name == m_type_name && (*dc->m_func) == (*m_func); return (dc != nullptr) && dc->m_type_name == m_type_name && (*dc->m_func) == (*m_func);
} }
bool call_match(const Function_Params &vals, const Type_Conversions_State &t_conversions) const override bool call_match(const chaiscript::Function_Params &vals, const Type_Conversions_State &t_conversions) const override
{ {
std::vector<Boxed_Value> new_vals{Boxed_Value(Dynamic_Object(m_type_name))}; std::vector<Boxed_Value> new_vals{Boxed_Value(Dynamic_Object(m_type_name))};
new_vals.insert(new_vals.end(), vals.begin(), vals.end()); new_vals.insert(new_vals.end(), vals.begin(), vals.end());
return m_func->call_match(Function_Params{new_vals}, t_conversions); return m_func->call_match(chaiscript::Function_Params{new_vals}, t_conversions);
} }
protected: protected:
Boxed_Value do_call(const Function_Params &params, const Type_Conversions_State &t_conversions) const override Boxed_Value do_call(const chaiscript::Function_Params &params, const Type_Conversions_State &t_conversions) const override
{ {
auto bv = Boxed_Value(Dynamic_Object(m_type_name), true); auto bv = Boxed_Value(Dynamic_Object(m_type_name), true);
std::vector<Boxed_Value> new_params{bv}; std::vector<Boxed_Value> new_params{bv};
new_params.insert(new_params.end(), params.begin(), params.end()); new_params.insert(new_params.end(), params.begin(), params.end());
(*m_func)(Function_Params{new_params}, t_conversions); (*m_func)(chaiscript::Function_Params{new_params}, t_conversions);
return bv; return bv;
} }