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

Merge remote-tracking branch 'origin/remove_std_function' into develop

Browse Source 
Conflicts:
	include/chaiscript/dispatchkit/boxed_number.hpp
This commit is contained in:
Jason Turner
2015-06-08 14:34:02 -06:00
parent b95526951f ecafb4aad0
commit d4e22c2c2c
14 changed files with 227 additions and 210 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/chaiscript/dispatchkit/boxed_number.hpp
View File

@@ -251,7 +251,7 @@ namespace chaiscript
}
template<typename LHS>
static Boxed_Value oper_rhs(Operators::Opers t_oper, const Boxed_Value &t_lhs, const Boxed_Value &t_rhs)
inline static Boxed_Value oper_rhs(Operators::Opers t_oper, const Boxed_Value &t_lhs, const Boxed_Value &t_rhs)
{
const auto &inp_ = t_rhs.get_type_info();
@@ -292,7 +292,7 @@ namespace chaiscript
}
}
static Boxed_Value oper(Operators::Opers t_oper, const Boxed_Value &t_lhs, const Boxed_Value &t_rhs)
inline static Boxed_Value oper(Operators::Opers t_oper, const Boxed_Value &t_lhs, const Boxed_Value &t_rhs)
{
const Type_Info &inp_ = t_lhs.get_type_info();