[Boost-commit] svn:boost r40394 - in trunk/boost/xpressive: detail/core detail/core/matcher detail/utility proto proto/transform

From: joel_at_[hidden]
Date: 2007-10-23 22:38:02

Author: djowel
Date: 2007-10-23 22:38:02 EDT (Tue, 23 Oct 2007)
New Revision: 40394
URL: http://svn.boost.org/trac/boost/changeset/40394

Log:
Fusion 2.1 one more time with care
Text files modified: 
   trunk/boost/xpressive/detail/core/linker.hpp                 |     2 +-                                      
   trunk/boost/xpressive/detail/core/matcher/action_matcher.hpp |     8 ++++----                                
   trunk/boost/xpressive/detail/utility/any.hpp                 |     2 +-                                      
   trunk/boost/xpressive/detail/utility/cons.hpp                |     2 +-                                      
   trunk/boost/xpressive/proto/fusion.hpp                       |    18 +++++++++---------                      
   trunk/boost/xpressive/proto/make_expr.hpp                    |     6 +++---                                  
   trunk/boost/xpressive/proto/transform/list.hpp               |     2 +-                                      
   7 files changed, 20 insertions(+), 20 deletions(-)

Modified: trunk/boost/xpressive/detail/core/linker.hpp
==============================================================================
--- trunk/boost/xpressive/detail/core/linker.hpp	(original)
+++ trunk/boost/xpressive/detail/core/linker.hpp	2007-10-23 22:38:02 EDT (Tue, 23 Oct 2007)
@@ -25,7 +25,7 @@
 #include <boost/version.hpp>
 
 #if BOOST_VERSION >= 103500
-# include <boost/fusion/algorithm/iteration/for_each.hpp>
+# include <boost/fusion/include/for_each.hpp>
 #else
 # include <boost/spirit/fusion/algorithm/for_each.hpp>
 #endif

Modified: trunk/boost/xpressive/detail/core/matcher/action_matcher.hpp
==============================================================================
--- trunk/boost/xpressive/detail/core/matcher/action_matcher.hpp	(original)
+++ trunk/boost/xpressive/detail/core/matcher/action_matcher.hpp	2007-10-23 22:38:02 EDT (Tue, 23 Oct 2007)
@@ -30,10 +30,10 @@
 #include <boost/xpressive/proto/context.hpp>
 #if BOOST_VERSION >= 103500
 # include <boost/xpressive/proto/fusion.hpp>
-# include <boost/fusion/sequence/view/transform_view.hpp>
-# include <boost/fusion/functional/invocation/invoke.hpp>
-# include <boost/fusion/algorithm/transformation/push_front.hpp>
-# include <boost/fusion/algorithm/transformation/pop_front.hpp>
+# include <boost/fusion/include/transform_view.hpp>
+# include <boost/fusion/include/invoke.hpp>
+# include <boost/fusion/include/push_front.hpp>
+# include <boost/fusion/include/pop_front.hpp>
 #endif
 
 namespace boost { namespace xpressive { namespace detail

Modified: trunk/boost/xpressive/detail/utility/any.hpp
==============================================================================
--- trunk/boost/xpressive/detail/utility/any.hpp	(original)
+++ trunk/boost/xpressive/detail/utility/any.hpp	2007-10-23 22:38:02 EDT (Tue, 23 Oct 2007)
@@ -15,7 +15,7 @@
 // In Boost 1.33+, we have a cons list in Fusion, so just include it.
 
 # if BOOST_VERSION >= 103500
-#  include <boost/fusion/algorithm/query/any.hpp> // Boost 1.35+ has Fusion2
+#  include <boost/fusion/include/any.hpp> // Boost 1.35+ has Fusion2
 # else
 #  include <boost/spirit/fusion/algorithm/any.hpp> // Fusion1
 # endif

Modified: trunk/boost/xpressive/detail/utility/cons.hpp
==============================================================================
--- trunk/boost/xpressive/detail/utility/cons.hpp	(original)
+++ trunk/boost/xpressive/detail/utility/cons.hpp	2007-10-23 22:38:02 EDT (Tue, 23 Oct 2007)
@@ -15,7 +15,7 @@
 // In Boost 1.33+, we have a cons list in Fusion, so just include it.
 
 # if BOOST_VERSION >= 103500
-#  include <boost/fusion/sequence/container/list/cons.hpp> // Boost 1.35+ has Fusion2
+#  include <boost/fusion/include/cons.hpp> // Boost 1.35+ has Fusion2
 # else
 #  include <boost/spirit/fusion/sequence/cons.hpp> // Fusion1
 # endif

Modified: trunk/boost/xpressive/proto/fusion.hpp
==============================================================================
--- trunk/boost/xpressive/proto/fusion.hpp	(original)
+++ trunk/boost/xpressive/proto/fusion.hpp	2007-10-23 22:38:02 EDT (Tue, 23 Oct 2007)
@@ -21,18 +21,18 @@
 #include <boost/mpl/next_prior.hpp>
 #include <boost/type_traits/remove_const.hpp>
 #include <boost/type_traits/remove_reference.hpp>
-#include <boost/fusion/support/is_view.hpp>
-#include <boost/fusion/support/tag_of_fwd.hpp>
-#include <boost/fusion/support/category_of.hpp>
-#include <boost/fusion/support/iterator_base.hpp>
-#include <boost/fusion/sequence/intrinsic/mpl.hpp>
-#include <boost/fusion/sequence/intrinsic.hpp>
-#include <boost/fusion/sequence/view/single_view.hpp>
-#include <boost/fusion/sequence/view/transform_view.hpp>
+#include <boost/fusion/include/is_view.hpp>
+#include <boost/fusion/include/tag_of_fwd.hpp>
+#include <boost/fusion/include/category_of.hpp>
+#include <boost/fusion/include/iterator_base.hpp>
+#include <boost/fusion/include/mpl.hpp>
+#include <boost/fusion/include/intrinsic.hpp>
+#include <boost/fusion/include/single_view.hpp>
+#include <boost/fusion/include/transform_view.hpp>
 #include <boost/fusion/support/ext_/is_segmented.hpp>
 #include <boost/fusion/sequence/intrinsic/ext_/segments.hpp>
 #include <boost/fusion/sequence/intrinsic/ext_/size_s.hpp>
-#include <boost/fusion/sequence/view/ext_/segmented_iterator.hpp>
+#include <boost/fusion/view/ext_/segmented_iterator.hpp>
 #include <boost/xpressive/proto/detail/suffix.hpp>
 
 #define UNREF(x) typename remove_reference<x>::type

Modified: trunk/boost/xpressive/proto/make_expr.hpp
==============================================================================
--- trunk/boost/xpressive/proto/make_expr.hpp	(original)
+++ trunk/boost/xpressive/proto/make_expr.hpp	2007-10-23 22:38:02 EDT (Tue, 23 Oct 2007)
@@ -52,9 +52,9 @@
     #include <boost/xpressive/proto/domain.hpp>
     #include <boost/xpressive/proto/generate.hpp>
     #if BOOST_VERSION >= 103500
-    # include <boost/fusion/sequence/intrinsic/at.hpp>
-    # include <boost/fusion/sequence/intrinsic/value_at.hpp>
-    # include <boost/fusion/sequence/intrinsic/size.hpp>
+    # include <boost/fusion/include/at.hpp>
+    # include <boost/fusion/include/value_at.hpp>
+    # include <boost/fusion/include/size.hpp>
     namespace boost { namespace proto { namespace detail
     {
         namespace fusion_ = fusion;

Modified: trunk/boost/xpressive/proto/transform/list.hpp
==============================================================================
--- trunk/boost/xpressive/proto/transform/list.hpp	(original)
+++ trunk/boost/xpressive/proto/transform/list.hpp	2007-10-23 22:38:02 EDT (Tue, 23 Oct 2007)
@@ -15,7 +15,7 @@
 #if BOOST_VERSION < 103500
 # include <boost/spirit/fusion/sequence/cons.hpp>
 #else
-# include <boost/fusion/sequence/container/list/cons.hpp>
+# include <boost/fusion/include/cons.hpp>
 #endif
 #include <boost/xpressive/proto/proto_fwd.hpp>
 #include <boost/xpressive/proto/detail/suffix.hpp>