From 5a651e2b8a0d5000e4c994ae2fa0a3fe6bf1fdc6 Mon Sep 17 00:00:00 2001
From: Jason Turner <jason@emptycrate.com>
Date: Thu, 1 Oct 2015 09:56:53 -0600
Subject: [PATCH] Fix numeric overload resolution

Closes #209
---
 include/chaiscript/dispatchkit/dispatchkit.hpp     | 1 +
 include/chaiscript/dispatchkit/proxy_functions.hpp | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/include/chaiscript/dispatchkit/dispatchkit.hpp b/include/chaiscript/dispatchkit/dispatchkit.hpp
index de2caa0..806abae 100644
--- a/include/chaiscript/dispatchkit/dispatchkit.hpp
+++ b/include/chaiscript/dispatchkit/dispatchkit.hpp
@@ -1033,6 +1033,7 @@ namespace chaiscript
           if (funs.first != loc) t_loc.store(uint_fast32_t(funs.first), std::memory_order_relaxed);
           Boxed_Value bv = dispatch::dispatch(*funs.second, params, m_conversions);
           // the result of a clone is never to be marked as a return_value
+          // \todo see if we can eliminate this comparison
           if (t_name == "clone") {
             bv.reset_return_value();
           }
diff --git a/include/chaiscript/dispatchkit/proxy_functions.hpp b/include/chaiscript/dispatchkit/proxy_functions.hpp
index 156831f..d9da2e6 100644
--- a/include/chaiscript/dispatchkit/proxy_functions.hpp
+++ b/include/chaiscript/dispatchkit/proxy_functions.hpp
@@ -211,7 +211,7 @@ namespace chaiscript
           if (ti.is_undef() 
               || ti.bare_equal(user_type<Boxed_Value>())
               || (!bv.get_type_info().is_undef()
-                && (ti.bare_equal(user_type<Boxed_Number>())
+                && ( (ti.bare_equal(user_type<Boxed_Number>()) && bv.get_type_info().is_arithmetic())
                   || ti.bare_equal(bv.get_type_info())
                   || bv.get_type_info().bare_equal(user_type<std::shared_ptr<const Proxy_Function_Base> >())
                   || t_conversions.converts(ti, bv.get_type_info())