[Boost-commit] svn:boost r65847 - in trunk/boost/msm: . back front

Subject: [Boost-commit] svn:boost r65847 - in trunk/boost/msm: . back front
From: christophe.j.henry_at_[hidden]
Date: 2010-10-08 17:44:54

Author: chenry
Date: 2010-10-08 17:44:48 EDT (Fri, 08 Oct 2010)
New Revision: 65847
URL: http://svn.boost.org/trac/boost/changeset/65847

Log:
fixed bug: conflict with boost.test
Text files modified: 
   trunk/boost/msm/back/state_machine.hpp      |     3 +++                                     
   trunk/boost/msm/front/functor_row.hpp       |     2 ++                                      
   trunk/boost/msm/front/state_machine_def.hpp |     3 +++                                     
   trunk/boost/msm/proto_config.hpp            |     2 ++                                      
   4 files changed, 10 insertions(+), 0 deletions(-)

Modified: trunk/boost/msm/back/state_machine.hpp
==============================================================================
--- trunk/boost/msm/back/state_machine.hpp	(original)
+++ trunk/boost/msm/back/state_machine.hpp	2010-10-08 17:44:48 EDT (Fri, 08 Oct 2010)
@@ -17,6 +17,9 @@
 #include <functional>
 #include <numeric>
 #include <utility>
+
+#define BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS
+
 #include <boost/mpl/contains.hpp>
 #include <boost/mpl/deref.hpp>
 

Modified: trunk/boost/msm/front/functor_row.hpp
==============================================================================
--- trunk/boost/msm/front/functor_row.hpp	(original)
+++ trunk/boost/msm/front/functor_row.hpp	2010-10-08 17:44:48 EDT (Fri, 08 Oct 2010)
@@ -11,6 +11,8 @@
 #ifndef BOOST_MSM_FRONT_FUNCTOR_ROW_H
 #define BOOST_MSM_FRONT_FUNCTOR_ROW_H
 
+#define BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS
+
 #include <boost/mpl/set.hpp>
 #include <boost/mpl/for_each.hpp>
 

Modified: trunk/boost/msm/front/state_machine_def.hpp
==============================================================================
--- trunk/boost/msm/front/state_machine_def.hpp	(original)
+++ trunk/boost/msm/front/state_machine_def.hpp	2010-10-08 17:44:48 EDT (Fri, 08 Oct 2010)
@@ -13,6 +13,9 @@
 
 #include <exception>
 #include <boost/assert.hpp>
+
+#define BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS
+
 #include <boost/mpl/vector.hpp>
 
 #include <boost/msm/row_tags.hpp>

Modified: trunk/boost/msm/proto_config.hpp
==============================================================================
--- trunk/boost/msm/proto_config.hpp	(original)
+++ trunk/boost/msm/proto_config.hpp	2010-10-08 17:44:48 EDT (Fri, 08 Oct 2010)
@@ -11,6 +11,8 @@
 #ifndef BOOST_MSM_PROTO_CONFIG_H
 #define BOOST_MSM_PROTO_CONFIG_H
 
+#define BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS
+
 #ifdef BOOST_MSVC 
   #if BOOST_PROTO_MAX_ARITY <= 7
     #ifdef BOOST_MPL_LIMIT_METAFUNCTION_ARITY