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

Merge branch 'master' into 2011-09-09-CxScript

Browse Source 
Conflicts:
	include/chaiscript/language/chaiscript_eval.hpp
	unittests/object_lifetime_test.cpp
	unittests/utility_test.cpp
This commit is contained in:
Jason Turner
2012-05-16 11:50:44 -06:00
parent 4674594ee7 4bcaa75fa4
commit a04dbf2c2d
9 changed files with 84 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -188,7 +188,12 @@ namespace chaiscript
virtual bool operator==(const Proxy_Function_Base &rhs) const
{
return this == &rhs;
const Dynamic_Proxy_Function *prhs = dynamic_cast<const Dynamic_Proxy_Function *>(&rhs);
return this == &rhs
|| (prhs
&& this->m_arity == prhs->m_arity
&& !this->m_guard && !prhs->m_guard);
}
virtual bool call_match(const std::vector<Boxed_Value> &vals) const