From ee5a93d90fe9be08e91ef16b9ebdfcdc9148daa2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jaakko=20J=C3=A4rvi?= <jarvi@cs.tamu.edu>
Date: Mon, 5 Jan 2004 16:18:02 +0000
Subject: [PATCH] Merged fix to suppress gcc3.4 warnings in make_void from main
 trunk to branch

[SVN r21504]
---
 include/boost/lambda/detail/lambda_functor_base.hpp | 2 +-
 include/boost/lambda/detail/ret.hpp                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/boost/lambda/detail/lambda_functor_base.hpp b/include/boost/lambda/detail/lambda_functor_base.hpp
index 23c174f..3dec802 100644
--- a/include/boost/lambda/detail/lambda_functor_base.hpp
+++ b/include/boost/lambda/detail/lambda_functor_base.hpp
@@ -315,7 +315,7 @@ public:
 
 
   template<class RET, CALL_TEMPLATE_ARGS> RET call(CALL_FORMAL_ARGS) const {
-    CALL_USE_ARGS;
+    return CALL_USE_ARGS;
   }
 
   template<class SigArgs> struct sig { typedef void type; };
diff --git a/include/boost/lambda/detail/ret.hpp b/include/boost/lambda/detail/ret.hpp
index f4e93ec..c19d8d3 100644
--- a/include/boost/lambda/detail/ret.hpp
+++ b/include/boost/lambda/detail/ret.hpp
@@ -257,7 +257,7 @@ const_parameters(const lambda_functor<Arg>& lf)
 // the wrapped lambda functor is evaluated, but we just don't do anything
 // with the result.
 struct voidifier_action {
-  template<class Ret, class A> static Ret apply(A&) {}
+  template<class Ret, class A> static void apply(A&) {}
 };
 
 template<class Args> struct return_type_N<voidifier_action, Args> {