Subject: [Boost-commit] svn:boost r68471 - in sandbox/SOC/2010/phoenix3: boost/phoenix/core/detail/preprocessed boost/phoenix/statement/detail libs/phoenix/preprocess
From: thom.heller_at_[hidden]
Date: 2011-01-27 06:29:24
Author: theller
Date: 2011-01-27 06:29:23 EST (Thu, 27 Jan 2011)
New Revision: 68471
URL: http://svn.boost.org/trac/boost/changeset/68471
Log:
fixed preprocessed files
Text files modified:
sandbox/SOC/2010/phoenix3/boost/phoenix/core/detail/preprocessed/actor_result_of_10.hpp | 5 ++++-
sandbox/SOC/2010/phoenix3/boost/phoenix/core/detail/preprocessed/actor_result_of_20.hpp | 5 ++++-
sandbox/SOC/2010/phoenix3/boost/phoenix/core/detail/preprocessed/actor_result_of_30.hpp | 5 ++++-
sandbox/SOC/2010/phoenix3/boost/phoenix/core/detail/preprocessed/actor_result_of_40.hpp | 5 ++++-
sandbox/SOC/2010/phoenix3/boost/phoenix/core/detail/preprocessed/actor_result_of_50.hpp | 5 ++++-
sandbox/SOC/2010/phoenix3/boost/phoenix/statement/detail/try_catch_eval.hpp | 8 ++++++++
sandbox/SOC/2010/phoenix3/libs/phoenix/preprocess/wave.cfg | 12 ++++++++----
7 files changed, 36 insertions(+), 9 deletions(-)
Modified: sandbox/SOC/2010/phoenix3/boost/phoenix/core/detail/preprocessed/actor_result_of_10.hpp
==============================================================================
--- sandbox/SOC/2010/phoenix3/boost/phoenix/core/detail/preprocessed/actor_result_of_10.hpp (original)
+++ sandbox/SOC/2010/phoenix3/boost/phoenix/core/detail/preprocessed/actor_result_of_10.hpp 2011-01-27 06:29:23 EST (Thu, 27 Jan 2011)
@@ -17,7 +17,10 @@
typedef
typename evaluator::impl<
Expr const&
- , fusion::vector2<fusion::vector1<const actor<Expr> *>&, default_actions>&
+ , fusion::vector2<
+ fusion::vector1<const ::boost::phoenix::actor<Expr> *>
+ , default_actions
+ >
, int
>::result_type
type;
Modified: sandbox/SOC/2010/phoenix3/boost/phoenix/core/detail/preprocessed/actor_result_of_20.hpp
==============================================================================
--- sandbox/SOC/2010/phoenix3/boost/phoenix/core/detail/preprocessed/actor_result_of_20.hpp (original)
+++ sandbox/SOC/2010/phoenix3/boost/phoenix/core/detail/preprocessed/actor_result_of_20.hpp 2011-01-27 06:29:23 EST (Thu, 27 Jan 2011)
@@ -17,7 +17,10 @@
typedef
typename evaluator::impl<
Expr const&
- , fusion::vector2<fusion::vector1<const actor<Expr> *>&, default_actions>&
+ , fusion::vector2<
+ fusion::vector1<const ::boost::phoenix::actor<Expr> *>
+ , default_actions
+ >
, int
>::result_type
type;
Modified: sandbox/SOC/2010/phoenix3/boost/phoenix/core/detail/preprocessed/actor_result_of_30.hpp
==============================================================================
--- sandbox/SOC/2010/phoenix3/boost/phoenix/core/detail/preprocessed/actor_result_of_30.hpp (original)
+++ sandbox/SOC/2010/phoenix3/boost/phoenix/core/detail/preprocessed/actor_result_of_30.hpp 2011-01-27 06:29:23 EST (Thu, 27 Jan 2011)
@@ -17,7 +17,10 @@
typedef
typename evaluator::impl<
Expr const&
- , fusion::vector2<fusion::vector1<const actor<Expr> *>&, default_actions>&
+ , fusion::vector2<
+ fusion::vector1<const ::boost::phoenix::actor<Expr> *>
+ , default_actions
+ >
, int
>::result_type
type;
Modified: sandbox/SOC/2010/phoenix3/boost/phoenix/core/detail/preprocessed/actor_result_of_40.hpp
==============================================================================
--- sandbox/SOC/2010/phoenix3/boost/phoenix/core/detail/preprocessed/actor_result_of_40.hpp (original)
+++ sandbox/SOC/2010/phoenix3/boost/phoenix/core/detail/preprocessed/actor_result_of_40.hpp 2011-01-27 06:29:23 EST (Thu, 27 Jan 2011)
@@ -17,7 +17,10 @@
typedef
typename evaluator::impl<
Expr const&
- , fusion::vector2<fusion::vector1<const actor<Expr> *>&, default_actions>&
+ , fusion::vector2<
+ fusion::vector1<const ::boost::phoenix::actor<Expr> *>
+ , default_actions
+ >
, int
>::result_type
type;
Modified: sandbox/SOC/2010/phoenix3/boost/phoenix/core/detail/preprocessed/actor_result_of_50.hpp
==============================================================================
--- sandbox/SOC/2010/phoenix3/boost/phoenix/core/detail/preprocessed/actor_result_of_50.hpp (original)
+++ sandbox/SOC/2010/phoenix3/boost/phoenix/core/detail/preprocessed/actor_result_of_50.hpp 2011-01-27 06:29:23 EST (Thu, 27 Jan 2011)
@@ -17,7 +17,10 @@
typedef
typename evaluator::impl<
Expr const&
- , fusion::vector2<fusion::vector1<const actor<Expr> *>&, default_actions>&
+ , fusion::vector2<
+ fusion::vector1<const ::boost::phoenix::actor<Expr> *>
+ , default_actions
+ >
, int
>::result_type
type;
Modified: sandbox/SOC/2010/phoenix3/boost/phoenix/statement/detail/try_catch_eval.hpp
==============================================================================
--- sandbox/SOC/2010/phoenix3/boost/phoenix/statement/detail/try_catch_eval.hpp (original)
+++ sandbox/SOC/2010/phoenix3/boost/phoenix/statement/detail/try_catch_eval.hpp 2011-01-27 06:29:23 EST (Thu, 27 Jan 2011)
@@ -63,6 +63,14 @@
#else
+// **FIXME**: why?
+#ifdef catch
+#undef catch
+#endif
+#ifdef try
+#undef try
+#endif
+
template <typename Env, typename Try, PHOENIX_typename_A>
typename boost::enable_if<
proto::matches<
Modified: sandbox/SOC/2010/phoenix3/libs/phoenix/preprocess/wave.cfg
==============================================================================
--- sandbox/SOC/2010/phoenix3/libs/phoenix/preprocess/wave.cfg (original)
+++ sandbox/SOC/2010/phoenix3/libs/phoenix/preprocess/wave.cfg 2011-01-27 06:29:23 EST (Thu, 27 Jan 2011)
@@ -1,12 +1,16 @@
-DPHOENIX_DONT_USE_PREPROCESSED_FILES
-DPHOENIX_CREATE_PREPROCESSED_FILES
--S/home/thomas/programming/boost
--S/usr/lib/gcc/x86_64-unknown-linux-gnu/4.5.2/include
--S/usr/include/c++/4.5.2
--S/usr/include/c++/4.5.2/x86_64-unknown-linux-gnu
+-S/home/cip/ce/sithhell/programming/boost
+-S/usr/lib/gcc/i486-linux-gnu/4.3.2/include
+-S/usr/include/c++/4.3.2
+-S/usr/include/c++/4.3.2/i486-linux-gnu
-S/usr/include
+-S/usr/include/linux
--variadics
--long_long
+-D__GNUC__=4
+-D__GNUC_MINOR_=3
+-D__GNUC_PATCHLEVEL_=2
-D_WIN32
-DWIN32
-D_MT