|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r64356 - sandbox/SOC/2010/phoenix3/boost/phoenix/core
From: thom.heller_at_[hidden]
Date: 2010-07-26 06:36:00
Author: theller
Date: 2010-07-26 06:35:59 EDT (Mon, 26 Jul 2010)
New Revision: 64356
URL: http://svn.boost.org/trac/boost/changeset/64356
Log:
+ minor tweaks to improve compile time
Text files modified:
sandbox/SOC/2010/phoenix3/boost/phoenix/core/actor.hpp | 2 +-
sandbox/SOC/2010/phoenix3/boost/phoenix/core/environment.hpp | 1 -
sandbox/SOC/2010/phoenix3/boost/phoenix/core/limits.hpp | 21 ++++++++++++++++-----
3 files changed, 17 insertions(+), 7 deletions(-)
Modified: sandbox/SOC/2010/phoenix3/boost/phoenix/core/actor.hpp
==============================================================================
--- sandbox/SOC/2010/phoenix3/boost/phoenix/core/actor.hpp (original)
+++ sandbox/SOC/2010/phoenix3/boost/phoenix/core/actor.hpp 2010-07-26 06:35:59 EDT (Mon, 26 Jul 2010)
@@ -380,7 +380,7 @@
template <typename Env>
typename boost::result_of<
eval_grammar(A0 const&, typename basic_environment<Env>::type&)
- >::type
+ >::type
operator()(Env& env, A0 const& a0, A1 const& a1, A2 const& a2) const
{
typename basic_environment<Env>::type args(eval(a1, env), eval(a2, env));
Modified: sandbox/SOC/2010/phoenix3/boost/phoenix/core/environment.hpp
==============================================================================
--- sandbox/SOC/2010/phoenix3/boost/phoenix/core/environment.hpp (original)
+++ sandbox/SOC/2010/phoenix3/boost/phoenix/core/environment.hpp 2010-07-26 06:35:59 EDT (Mon, 26 Jul 2010)
@@ -8,7 +8,6 @@
#define PHOENIX_CORE_ENVIRONMENT_HPP
#include <boost/phoenix/core/limits.hpp>
-#include <boost/fusion/container/vector/vector.hpp>
#include <boost/fusion/sequence/intrinsic/at.hpp>
#include <boost/fusion/support/is_sequence.hpp>
#include <boost/phoenix/support/iterate.hpp>
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-07-26 06:35:59 EDT (Mon, 26 Jul 2010)
@@ -80,11 +80,22 @@
// this include will bring in mpl::vectorN and
// fusion::vectorN where N is PHOENIX_LIMIT
-#include <boost/fusion/include/vector.hpp>
-
-// for some reason, this must be included now to make
-// detail/type_deduction.hpp compile. $$$ TODO: Investigate further $$$
-#include <boost/mpl/vector/vector20.hpp>
+#include <boost/fusion/container/vector/vector10.hpp>
+#if PHOENIX_LIMIT > 10
+#include <boost/fusion/container/vector/vector20.hpp>
+#endif
+#if PHOENIX_LIMIT > 20
+#include <boost/fusion/container/vector/vector30.hpp>
+#endif
+#if PHOENIX_LIMIT > 30
+#include <boost/fusion/container/vector/vector40.hpp>
+#endif
+#if PHOENIX_LIMIT > 40
+#include <boost/fusion/container/vector/vector50.hpp>
+#endif
+#if PHOENIX_LIMIT > 50
+#error "PHOENIX_LIMIT too high!"
+#endif
#if !defined(BOOST_PROTO_MAX_ARITY)
#define BOOST_PROTO_MAX_ARITY BOOST_PP_INC(PHOENIX_COMPOSITE_LIMIT)
Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk