Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r75941 - branches/release/boost/msm/back
From: christophe.j.henry_at_[hidden]
Date: 2011-12-14 15:54:24


Author: chenry
Date: 2011-12-14 15:54:24 EST (Wed, 14 Dec 2011)
New Revision: 75941
URL: http://svn.boost.org/trac/boost/changeset/75941

Log:
Fixed failed merge from rev. 72031
Text files modified:
   branches/release/boost/msm/back/state_machine.hpp | 2 --
   1 files changed, 0 insertions(+), 2 deletions(-)

Modified: branches/release/boost/msm/back/state_machine.hpp
==============================================================================
--- branches/release/boost/msm/back/state_machine.hpp (original)
+++ branches/release/boost/msm/back/state_machine.hpp 2011-12-14 15:54:24 EST (Wed, 14 Dec 2011)
@@ -17,8 +17,6 @@
 #include <numeric>
 #include <utility>
 
-#define BOOST_MPL_CFG_NO_PREPROCESSED_HEADERS
-
 #include <boost/mpl/contains.hpp>
 #include <boost/mpl/deref.hpp>
 #include <boost/mpl/assert.hpp>


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