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

Regression - fix VisualStudio builds

Browse Source
This commit is contained in:
Jason Turner
2010-10-23 16:25:16 +00:00
parent 2d353cb189
commit 70cc1111f3
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/chaiscript/dispatchkit/bootstrap.hpp
View File

@@ -507,11 +507,11 @@ namespace chaiscript
} }
template<typename FunctionType> template<typename FunctionType>
static std::vector<Boxed_Value> do_return_boxed_value_vector(const boost::function<FunctionType> &f, static std::vector<Boxed_Value> do_return_boxed_value_vector(FunctionType f,
const Proxy_Function_Base *b) const Proxy_Function_Base *b)
{ {
typedef typename boost::function_types::result_type<FunctionType>::type Vector; typedef typename boost::function_types::result_type<FunctionType>::type Vector;
Vector v = f(b); Vector v = (b->*f)();
std::vector<Boxed_Value> vbv; std::vector<Boxed_Value> vbv;
for (typename Vector::const_iterator itr = v.begin(); for (typename Vector::const_iterator itr = v.begin();
@@ -527,9 +527,7 @@ namespace chaiscript
template<typename Function> template<typename Function>
static boost::function<std::vector<Boxed_Value> (const Proxy_Function_Base*)> return_boxed_value_vector(const Function &f) static boost::function<std::vector<Boxed_Value> (const Proxy_Function_Base*)> return_boxed_value_vector(const Function &f)
{ {
typedef typename boost::function_types::result_type<Function>::type Vector; return boost::bind(&do_return_boxed_value_vector<Function>, f, _1);
boost::function<Vector (const Proxy_Function_Base *)> func(f);
return boost::bind(&do_return_boxed_value_vector<Vector (const Proxy_Function_Base *)>, func, _1);
} }
public: public: