generic-library/ChaiScript
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove Do_Call helper class

Browse Source
This commit is contained in:
Jason Turner
2016-04-15 15:31:19 -06:00
parent 7d9dbc3d86
commit 6fa83bca85
3 changed files with 54 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/chaiscript/dispatchkit/proxy_functions.hpp
View File

@@ -595,8 +595,7 @@ namespace chaiscript
protected:
Boxed_Value do_call(const std::vector<Boxed_Value> &params, const Type_Conversions_State &t_conversions) const override
{
typedef typename detail::Function_Signature<Func>::Return_Type Return_Type;
return detail::Do_Call<Return_Type>::template go<Func>(m_f, params, t_conversions);
return detail::call_func(detail::Function_Signature<Func>(), m_f, params, t_conversions);
}
private:
@@ -648,7 +647,7 @@ namespace chaiscript
protected:
Boxed_Value do_call(const std::vector<Boxed_Value> &params, const Type_Conversions_State &t_conversions) const override
{
return detail::Do_Call<typename std::function<Func>::result_type>::template go<Func>(m_f.get(), params, t_conversions);
return detail::call_func(detail::Function_Signature<Func>(), m_f.get(), params, t_conversions);
}