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

Merge branch 'release-5.x' into develop

Browse Source
This commit is contained in:
Jason Turner
2016-10-05 15:14:58 -06:00
parent 3b2c82ba2c bec1b91b7b
commit b2907fc608
4 changed files with 34 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -819,7 +819,8 @@ namespace chaiscript
plist.begin(),
std::back_inserter(newplist),
[](const Type_Info &ti, const Boxed_Value &param) -> Boxed_Value {
if (ti.is_arithmetic() && param.get_type_info().is_arithmetic()) {
if (ti.is_arithmetic() && param.get_type_info().is_arithmetic()
&& param.get_type_info() != ti) {
return Boxed_Number(param).get_as(ti).bv;
} else {
return param;
@@ -827,8 +828,6 @@ namespace chaiscript
}
);
try {
return (*(matching_func->second))(newplist, t_conversions);
} catch (const exception::bad_boxed_cast &) {

10
include/chaiscript/dispatchkit/type_info.hpp
View File

@@ -47,6 +47,16 @@ namespace chaiscript
return m_type_info < ti.m_type_info;
}
constexpr bool operator!=(const Type_Info &ti) const noexcept
{
return !(operator==(ti));
}
constexpr bool operator!=(const std::type_info &ti) const noexcept
{
return !(operator==(ti));
}
constexpr bool operator==(const Type_Info &ti) const noexcept
{
return ti.m_type_info == m_type_info