Fix returning of boolean values from functors

This commit is contained in:
Jason Turner
2014-10-12 22:12:54 -07:00
parent 78cd980067
commit 021e2a7949

View File

@@ -81,7 +81,7 @@ namespace chaiscript
Ret operator()(Param...param)
{
return Function_Caller_Ret<Ret, std::is_arithmetic<Ret>::value>::call(m_funcs, {
return Function_Caller_Ret<Ret, std::is_arithmetic<Ret>::value && !std::is_same<Ret, bool>::value>::call(m_funcs, {
(std::is_reference<Param>::value&&!(std::is_same<chaiscript::Boxed_Value, typename std::remove_const<typename std::remove_reference<Param>::type>::type>::value))?Boxed_Value(std::ref(param)):Boxed_Value(param)...
}, m_conversions