From cd6db4a38c43896fbc370a0d06fd30e624a100a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jaakko=20J=C3=A4rvi?= <jarvi@cs.tamu.edu>
Date: Mon, 31 Dec 2001 18:31:15 +0000
Subject: [PATCH] removed lambda_functor_sub as obsolete

[SVN r12182]
---
 include/boost/lambda/detail/lambda_fwd.hpp         |  2 --
 include/boost/lambda/detail/lambda_traits.hpp      |  6 ------
 include/boost/lambda/detail/return_type_traits.hpp | 11 +++++++----
 3 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/include/boost/lambda/detail/lambda_fwd.hpp b/include/boost/lambda/detail/lambda_fwd.hpp
index c7c9dff..d76e9ad 100644
--- a/include/boost/lambda/detail/lambda_fwd.hpp
+++ b/include/boost/lambda/detail/lambda_fwd.hpp
@@ -43,8 +43,6 @@ template <int I, class Act> class action;
 template <class BinderArgs> 
 struct lambda_functor;
 
-template <class BinderArgs> 
-struct lambda_functor_sub;
 
 template <class Action, 
           class Args, 
diff --git a/include/boost/lambda/detail/lambda_traits.hpp b/include/boost/lambda/detail/lambda_traits.hpp
index 25d5884..80d4bb7 100644
--- a/include/boost/lambda/detail/lambda_traits.hpp
+++ b/include/boost/lambda/detail/lambda_traits.hpp
@@ -147,12 +147,6 @@ template <class T> struct is_lambda_functor_ {
 template <class Arg> struct is_lambda_functor_<lambda_functor<Arg> > {
   BOOST_STATIC_CONSTANT(bool, value = true);
 };
-
-// lambda_functor_sub goes for lambda functor as well
-template <class Arg> struct is_lambda_functor_<lambda_functor_sub<Arg> > {
-  BOOST_STATIC_CONSTANT(bool, value = true);
-};
-
    
 } // end detail
 
diff --git a/include/boost/lambda/detail/return_type_traits.hpp b/include/boost/lambda/detail/return_type_traits.hpp
index 990dfe9..1a8b5f0 100644
--- a/include/boost/lambda/detail/return_type_traits.hpp
+++ b/include/boost/lambda/detail/return_type_traits.hpp
@@ -61,8 +61,11 @@ struct open_args {
 // The primary template:
 // if we know nothing about Arg, it is not a lambda_functor. 
 // Hence the return type is Arg itself.
+
 template <class Arg, class Open> 
-struct return_type { typedef Arg type; };
+struct return_type { 
+  typedef Arg type;
+};
 
 // Unary actions (result from unary operators)
 // do not have a default return type.
@@ -86,7 +89,7 @@ typedef typename boost::remove_reference<A>::type A1;
 typedef typename 
   detail::IF<
   is_lambda_functor<A>::value, 
-    lambda_functor_sub<
+    lambda_functor<
       lambda_functor_args< 
         action<1, Act>, 
         tuple<A2>, 
@@ -140,7 +143,7 @@ template <class Act, class A, class B> struct return_type_2_0 {
 typedef typename 
   detail::IF<
     is_lambda_functor<A>::value || is_lambda_functor<B>::value,
-    lambda_functor_sub<
+    lambda_functor<
       lambda_functor_args< 
         action<2, Act>, 
         tuple<A2, B2>, 
@@ -188,7 +191,7 @@ typedef typename
 //    detail::IF<
 //      is_lambda_functor<A>::value || is_lambda_functor<B>::value ||
 //      is_lambda_functor<C>::value,
-//      lambda_functor_sub<
+//      lambda_functor<
 //        lambda_functor_args< 
 //          action<3, Act>, 
 //          tuple<A2, B2, C2>,