From feb344e744d8eff62a8c1dbf6be5978fccde773c Mon Sep 17 00:00:00 2001
From: Jason Turner <jason@emptycrate.com>
Date: Thu, 25 Apr 2013 15:39:03 -0600
Subject: [PATCH] Fix various warnings found by MSVC

---
 include/chaiscript/dispatchkit/proxy_functions.hpp        | 8 ++++----
 include/chaiscript/dispatchkit/proxy_functions_detail.hpp | 5 +++--
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/include/chaiscript/dispatchkit/proxy_functions.hpp b/include/chaiscript/dispatchkit/proxy_functions.hpp
index 272b7c1..c66ed15 100644
--- a/include/chaiscript/dispatchkit/proxy_functions.hpp
+++ b/include/chaiscript/dispatchkit/proxy_functions.hpp
@@ -146,7 +146,7 @@ namespace chaiscript
         Proxy_Function_Base(const std::vector<Type_Info> &t_types)
           : m_types(t_types), m_has_arithmetic_param(false)
         {
-          for (int i = 1; i < m_types.size(); ++i)
+          for (size_t i = 1; i < m_types.size(); ++i)
           {
             if (m_types[i].is_arithmetic())
             {
@@ -628,7 +628,7 @@ namespace chaiscript
         bool types_match_except_for_arithmetic(const FuncType &t_func, const std::vector<Boxed_Value> &plist,
             const Dynamic_Cast_Conversions &t_conversions)
         {
-          if (t_func->get_arity() != plist.size())
+          if (t_func->get_arity() != static_cast<int>(plist.size()))
           {
             return false;
           }
@@ -637,7 +637,7 @@ namespace chaiscript
 
           assert(plist.size() == types.size() - 1);
 
-          for (int i = 0; i < plist.size(); ++i)
+          for (size_t i = 0; i < plist.size(); ++i)
           {
             if (Proxy_Function_Base::compare_type_to_param(types[i+1], plist[i], t_conversions)
                 || (types[i+1].is_arithmetic() && plist[i].get_type_info().is_arithmetic()))
@@ -686,7 +686,7 @@ namespace chaiscript
           std::vector<Boxed_Value> newplist;
           const std::vector<Type_Info> &tis = (*matching_func)->get_param_types();
 
-          for (int i = 0; i < plist.size(); ++i)
+          for (size_t i = 0; i < plist.size(); ++i)
           {
             if (tis[i+1].is_arithmetic()
                 && plist[i].get_type_info().is_arithmetic()) {
diff --git a/include/chaiscript/dispatchkit/proxy_functions_detail.hpp b/include/chaiscript/dispatchkit/proxy_functions_detail.hpp
index cf29568..7ae0955 100644
--- a/include/chaiscript/dispatchkit/proxy_functions_detail.hpp
+++ b/include/chaiscript/dispatchkit/proxy_functions_detail.hpp
@@ -88,7 +88,7 @@ namespace chaiscript
        */
       template<typename Ret BOOST_PP_COMMA_IF(n) BOOST_PP_ENUM_PARAMS(n, typename Param)>
         Ret call_func(const boost::function<Ret (BOOST_PP_ENUM_PARAMS(n, Param))> &f,
-            const std::vector<Boxed_Value> &params, const Dynamic_Cast_Conversions & BOOST_PP_IF(n, t_conversions, BOOST_PP_EMPTY))
+            const std::vector<Boxed_Value> &params, const Dynamic_Cast_Conversions & BOOST_PP_IF(n, t_conversions, ))
         {
           if (params.size() != n)
           {
@@ -105,9 +105,10 @@ namespace chaiscript
        */
       template<typename Ret BOOST_PP_COMMA_IF(n) BOOST_PP_ENUM_PARAMS(n, typename Param)>
         bool compare_types_cast(Ret (*)(BOOST_PP_ENUM_PARAMS(n, Param)),
-            const std::vector<Boxed_Value> & BOOST_PP_IF(n, params, BOOST_PP_EMPTY), const Dynamic_Cast_Conversions &t_conversions)
+            const std::vector<Boxed_Value> & BOOST_PP_IF(n, params, ), const Dynamic_Cast_Conversions &t_conversions)
         {
           try {
+            (void)t_conversions;
             BOOST_PP_REPEAT(n, trycast, ~);
           } catch (const exception::bad_boxed_cast &) {
             return false;