From b6e8605aee7015015ef5777c57ce7558dd6cf877 Mon Sep 17 00:00:00 2001 From: Jason Turner Date: Sat, 20 Sep 2014 14:17:41 -0600 Subject: [PATCH] Attempt again to satisfy gcc 4.6 --- include/chaiscript/dispatchkit/operators.hpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/include/chaiscript/dispatchkit/operators.hpp b/include/chaiscript/dispatchkit/operators.hpp index 562e3c09..12719a30 100644 --- a/include/chaiscript/dispatchkit/operators.hpp +++ b/include/chaiscript/dispatchkit/operators.hpp @@ -19,7 +19,7 @@ namespace chaiscript namespace detail { template - auto assign(L l, R r) -> decltype((l = r)) + auto assign(L l, R r) -> L& { return (l = r); } @@ -79,7 +79,7 @@ namespace chaiscript } template - auto assign_sum(L l, R r) -> decltype(( l += r)) + auto assign_sum(L l, R r) -> L& { return (l += r); } @@ -229,7 +229,7 @@ namespace chaiscript template ModulePtr assign(ModulePtr m = ModulePtr(new Module())) { - m->add(chaiscript::fun(static_cast(&detail::assign)), "="); + m->add(chaiscript::fun(&detail::assign), "="); return m; } @@ -299,7 +299,7 @@ namespace chaiscript template ModulePtr assign_sum(ModulePtr m = ModulePtr(new Module())) { - m->add(chaiscript::fun(static_cast(&detail::assign_sum)), "+="); + m->add(chaiscript::fun(&detail::assign_sum), "+="); return m; }