From ff817a24210ceded2f03a3eae1ff47c7bcaf108f Mon Sep 17 00:00:00 2001
From: Aleksey Gurtovoy <agurtovoy@meta-comm.com>
Date: Sun, 28 Nov 2004 02:04:02 +0000
Subject: [PATCH] merge RC_1_32_0 fixes

[SVN r26326]
---
 include/boost/mpl/aux_/arity_spec.hpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/boost/mpl/aux_/arity_spec.hpp b/include/boost/mpl/aux_/arity_spec.hpp
index 43819c0..441910c 100644
--- a/include/boost/mpl/aux_/arity_spec.hpp
+++ b/include/boost/mpl/aux_/arity_spec.hpp
@@ -22,7 +22,6 @@
 #include <boost/mpl/aux_/template_arity_fwd.hpp>
 #include <boost/mpl/aux_/config/ttp.hpp>
 #include <boost/mpl/aux_/config/lambda.hpp>
-#include <boost/mpl/aux_/config/overload_resolution.hpp>
 #include <boost/mpl/aux_/config/static_constant.hpp>
 
 #if defined(BOOST_MPL_CFG_BROKEN_DEFAULT_PARAMETERS_IN_NESTED_TEMPLATES)
@@ -49,7 +48,8 @@ struct arity< \
 /**/
 
 
-#if defined(BOOST_MPL_CFG_EXTENDED_TEMPLATE_PARAMETERS_MATCHING)
+#if defined(BOOST_MPL_CFG_EXTENDED_TEMPLATE_PARAMETERS_MATCHING) \
+    && !defined(BOOST_MPL_CFG_NO_FULL_LAMBDA_SUPPORT)
 #   define BOOST_MPL_AUX_TEMPLATE_ARITY_SPEC(i, name) \
 namespace aux { \
 template< BOOST_MPL_PP_PARAMS(i,typename T) > \