Subject: [Boost-commit] svn:boost r71790 - branches/msm/msm_phoenix/boost/msm/front/euml
From: christophe.j.henry_at_[hidden]
Date: 2011-05-07 16:54:52
Author: chenry
Date: 2011-05-07 16:54:51 EDT (Sat, 07 May 2011)
New Revision: 71790
URL: http://svn.boost.org/trac/boost/changeset/71790
Log:
added typedefs
Text files modified:
branches/msm/msm_phoenix/boost/msm/front/euml/state_grammar.hpp | 18 ++++++++++++++----
branches/msm/msm_phoenix/boost/msm/front/euml/stt_grammar.hpp | 3 ---
2 files changed, 14 insertions(+), 7 deletions(-)
Modified: branches/msm/msm_phoenix/boost/msm/front/euml/state_grammar.hpp
==============================================================================
--- branches/msm/msm_phoenix/boost/msm/front/euml/state_grammar.hpp (original)
+++ branches/msm/msm_phoenix/boost/msm/front/euml/state_grammar.hpp 2011-05-07 16:54:51 EDT (Sat, 07 May 2011)
@@ -11,6 +11,10 @@
#ifndef BOOST_MSM_FRONT_EUML_STATE_GRAMMAR_H
#define BOOST_MSM_FRONT_EUML_STATE_GRAMMAR_H
+#ifdef BOOST_MSM_EUML_PHOENIX_SUPPORT
+#include <boost/phoenix/core/meta_grammar.hpp>
+#endif
+
#include <boost/msm/front/euml/common.hpp>
#include <boost/fusion/container/vector.hpp>
#include <boost/fusion/include/pair.hpp>
@@ -210,8 +214,9 @@
>
{};
-struct my_custom_phoenix_grammar
- : proto::switch_<my_custom_phoenix_grammar>
+#ifdef BOOST_MSM_EUML_PHOENIX_SUPPORT
+struct CustomPhoenixGrammar
+ : proto::switch_<CustomPhoenixGrammar>
{
template <typename Tag, typename Dummy = void>
struct case_
@@ -222,13 +227,16 @@
>
{};
};
+#endif
struct GuardGrammar
: proto::or_<
+#ifdef BOOST_MSM_EUML_PHOENIX_SUPPORT
proto::when<
- my_custom_phoenix_grammar ,
+ CustomPhoenixGrammar ,
proto::_
>,
+#endif
proto::when<
BuildGuards ,
BuildGuards
@@ -238,10 +246,12 @@
struct ActionGrammar
: proto::or_<
+#ifdef BOOST_MSM_EUML_PHOENIX_SUPPORT
proto::when<
- my_custom_phoenix_grammar ,
+ CustomPhoenixGrammar ,
proto::_
>,
+#endif
proto::when<
BuildActionSequence ,
BuildActionSequence
Modified: branches/msm/msm_phoenix/boost/msm/front/euml/stt_grammar.hpp
==============================================================================
--- branches/msm/msm_phoenix/boost/msm/front/euml/stt_grammar.hpp (original)
+++ branches/msm/msm_phoenix/boost/msm/front/euml/stt_grammar.hpp 2011-05-07 16:54:51 EDT (Sat, 07 May 2011)
@@ -15,9 +15,6 @@
#include <boost/mpl/vector.hpp>
#include <boost/mpl/eval_if.hpp>
-#include <boost/phoenix/core/meta_grammar.hpp>
-#include <boost/phoenix/phoenix.hpp>
-
#include <boost/msm/front/euml/operator.hpp>
#include <boost/msm/front/euml/guard_grammar.hpp>
#include <boost/msm/front/euml/state_grammar.hpp>