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

Eradicate global base_class registrations to prevent problems with threading and general memory management issues with knowing how and when to clean them up.

Browse Source
This commit is contained in:
Jason Turner
2013-02-25 11:00:14 -07:00
parent 1858885010
commit 2afc09dad4
16 changed files with 308 additions and 314 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
include/chaiscript/dispatchkit/function_call.hpp
View File

@@ -32,10 +32,10 @@ namespace chaiscript
*/
template<typename FunctionType>
boost::function<FunctionType>
functor(const std::vector<Const_Proxy_Function> &funcs)
functor(const std::vector<Const_Proxy_Function> &funcs, const Dynamic_Cast_Conversions &t_conversions)
{
FunctionType *p=0;
return detail::build_function_caller_helper(p, funcs);
return detail::build_function_caller_helper(p, funcs, t_conversions);
}
/**
@@ -53,11 +53,11 @@ namespace chaiscript
*/
template<typename FunctionType>
boost::function<FunctionType>
functor(Const_Proxy_Function func)
functor(Const_Proxy_Function func, const Dynamic_Cast_Conversions &t_conversions)
{
std::vector<Const_Proxy_Function> funcs;
funcs.push_back(func);
return functor<FunctionType>(funcs);
return functor<FunctionType>(funcs, t_conversions);
}
/**
@@ -66,9 +66,9 @@ namespace chaiscript
*/
template<typename FunctionType>
boost::function<FunctionType>
functor(const Boxed_Value &bv)
functor(const Boxed_Value &bv, const Dynamic_Cast_Conversions &t_conversions)
{
return functor<FunctionType>(boxed_cast<Const_Proxy_Function >(bv));
return functor<FunctionType>(boxed_cast<Const_Proxy_Function >(bv, t_conversions), t_conversions);
}
}
@@ -81,13 +81,13 @@ namespace chaiscript
{
typedef boost::function<Signature> Result_Type;
static Result_Type cast(const Boxed_Value &ob)
static Result_Type cast(const Boxed_Value &ob, const Dynamic_Cast_Conversions &t_conversions)
{
if (ob.get_type_info().bare_equal(user_type<Const_Proxy_Function>()))
{
return dispatch::functor<Signature>(ob);
return dispatch::functor<Signature>(ob, t_conversions);
} else {
return Cast_Helper_Inner<const boost::function<Signature> &>::cast(ob);
return Cast_Helper_Inner<const boost::function<Signature> &>::cast(ob, t_conversions);
}
}
};
@@ -100,13 +100,13 @@ namespace chaiscript
{
typedef boost::function<Signature> Result_Type;
static Result_Type cast(const Boxed_Value &ob)
static Result_Type cast(const Boxed_Value &ob, const Dynamic_Cast_Conversions &t_conversions)
{
if (ob.get_type_info().bare_equal(user_type<Const_Proxy_Function>()))
{
return dispatch::functor<Signature>(ob);
return dispatch::functor<Signature>(ob, t_conversions);
} else {
return Cast_Helper_Inner<boost::function<Signature> >::cast(ob);
return Cast_Helper_Inner<boost::function<Signature> >::cast(ob, t_conversions);
}
}
};
@@ -119,13 +119,13 @@ namespace chaiscript
{
typedef boost::function<Signature> Result_Type;
static Result_Type cast(const Boxed_Value &ob)
static Result_Type cast(const Boxed_Value &ob, const Dynamic_Cast_Conversions &t_conversions)
{
if (ob.get_type_info().bare_equal(user_type<Const_Proxy_Function>()))
{
return dispatch::functor<Signature>(ob);
return dispatch::functor<Signature>(ob, t_conversions);
} else {
return Cast_Helper_Inner<const boost::function<Signature> >::cast(ob);
return Cast_Helper_Inner<const boost::function<Signature> >::cast(ob, t_conversions);
}
}
};