[Boost-commit] svn:boost r66809 - sandbox/SOC/2010/phoenix3/boost/phoenix/core

Subject: [Boost-commit] svn:boost r66809 - sandbox/SOC/2010/phoenix3/boost/phoenix/core
From: thom.heller_at_[hidden]
Date: 2010-11-28 07:07:21

Author: theller
Date: 2010-11-28 07:07:19 EST (Sun, 28 Nov 2010)
New Revision: 66809
URL: http://svn.boost.org/trac/boost/changeset/66809

Log:
fixed mpl oddity
Text files modified: 
   sandbox/SOC/2010/phoenix3/boost/phoenix/core/limits.hpp |    27 +++++++++++++--------------             
   1 files changed, 13 insertions(+), 14 deletions(-)

Modified: sandbox/SOC/2010/phoenix3/boost/phoenix/core/limits.hpp
==============================================================================
--- sandbox/SOC/2010/phoenix3/boost/phoenix/core/limits.hpp	(original)
+++ sandbox/SOC/2010/phoenix3/boost/phoenix/core/limits.hpp	2010-11-28 07:07:19 EST (Sun, 28 Nov 2010)
@@ -71,13 +71,25 @@
 # error "PHOENIX_LOCAL_LIMIT is set too low"
 #endif
 
-
 #if !defined(FUSION_MAX_VECTOR_SIZE)
 # define FUSION_MAX_VECTOR_SIZE PHOENIX_LIMIT
 #elif (FUSION_MAX_VECTOR_SIZE < PHOENIX_LIMIT)
 # error "FUSION_MAX_VECTOR_SIZE < PHOENIX_LIMIT"
 #endif
 
+#if !defined(BOOST_PROTO_MAX_ARITY)
+#   define BOOST_PROTO_MAX_ARITY PHOENIX_COMPOSITE_LIMIT
+#   if !defined(BOOST_MPL_LIMIT_METAFUNCTION_ARITY)
+#       define BOOST_MPL_LIMIT_METAFUNCTION_ARITY BOOST_PROTO_MAX_ARITY
+#       define BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS
+#   endif
+#elif (BOOST_PROTO_MAX_ARITY < PHOENIX_COMPOSE_LIMIT)
+#   error "BOOST_PROTO_MAX_ARITY < PHOENIX_COMPOSE_LIMIT"
+#endif
+
+// this include will set the limit for the proto expression arity
+#include <boost/proto/proto_fwd.hpp>
+
 // this include will bring in mpl::vectorN and 
 // fusion::vectorN where N is PHOENIX_LIMIT
 #include <boost/fusion/container/vector/vector10.hpp>
@@ -97,17 +109,4 @@
 #error "PHOENIX_LIMIT too high!"
 #endif
 
-#if !defined(BOOST_PROTO_MAX_ARITY)
-#define BOOST_PROTO_MAX_ARITY PHOENIX_COMPOSITE_LIMIT
-#ifdef BOOST_MPL_LIMIT_METAFUNCTION_ARITY
-#undef BOOST_MPL_LIMIT_METAFUNCTION_ARITY
-#endif
-#define BOOST_MPL_LIMIT_METAFUNCTION_ARITY BOOST_PROTO_MAX_ARITY
-#elif (BOOST_PROTO_MAX_ARITY < BOOST_PP_INC(PHOENIX_COMPOSE_LIMIT))
-#error "BOOST_PROTO_MAX_ARITY < PHOENIX_COMPOSE_LIMIT + 1"
-#endif
-
-// this include will set the limit for the proto expression arity
-#include <boost/proto/proto_fwd.hpp>
-
 #endif