From 7f8a6f24f907f4aeac02f7803e1a5c38f99a52f0 Mon Sep 17 00:00:00 2001 From: Jason Turner Date: Tue, 16 Feb 2016 11:13:14 -0700 Subject: [PATCH] Fix a few warnings from old gcc --- include/chaiscript/dispatchkit/dispatchkit.hpp | 4 ++-- include/chaiscript/language/chaiscript_engine.hpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/chaiscript/dispatchkit/dispatchkit.hpp b/include/chaiscript/dispatchkit/dispatchkit.hpp index 9670d0f..23dc7ee 100644 --- a/include/chaiscript/dispatchkit/dispatchkit.hpp +++ b/include/chaiscript/dispatchkit/dispatchkit.hpp @@ -1108,9 +1108,9 @@ namespace chaiscript } const Const_Proxy_Function &f = this->boxed_cast(params[0]); - const Type_Conversions_State conversions(m_conversions, m_conversions.conversion_saves()); + const Type_Conversions_State convs(m_conversions, m_conversions.conversion_saves()); - return Boxed_Value(f->call_match(std::vector(params.begin() + 1, params.end()), conversions)); + return Boxed_Value(f->call_match(std::vector(params.begin() + 1, params.end()), convs)); } /// Dump all system info to stdout diff --git a/include/chaiscript/language/chaiscript_engine.hpp b/include/chaiscript/language/chaiscript_engine.hpp index f0c42be..f3aa069 100644 --- a/include/chaiscript/language/chaiscript_engine.hpp +++ b/include/chaiscript/language/chaiscript_engine.hpp @@ -371,7 +371,7 @@ namespace chaiscript // m_engine.add(fun( - [=](const dispatch::Proxy_Function_Base &t_fun, const std::vector &t_params) { + [=](const dispatch::Proxy_Function_Base &t_fun, const std::vector &t_params) -> Boxed_Value { Type_Conversions_State s(this->m_engine.conversions(), this->m_engine.conversions().conversion_saves()); return t_fun(t_params, s); }), "call");