|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r73831 - in trunk: boost/fusion boost/fusion/algorithm/iteration/ext_ boost/fusion/algorithm/query/ext_ boost/fusion/container/ext_ boost/fusion/container/list/detail boost/fusion/iterator boost/fusion/iterator/segmented_iterator boost/fusion/iterator/segmented_iterator/detail boost/fusion/sequence boost/fusion/sequence/intrinsic boost/fusion/sequence/intrinsic/detail boost/fusion/sequence/intrinsic/ext_ boost/fusion/support boost/fusion/support/ext_ boost/fusion/view/ext_ boost/fusion/view/iterator_range/detail boost/proto libs/fusion/test/sequence/ext_
From: eric_at_[hidden]
Date: 2011-08-16 19:07:53
Author: eric_niebler
Date: 2011-08-16 19:07:51 EDT (Tue, 16 Aug 2011)
New Revision: 73831
URL: http://svn.boost.org/trac/boost/changeset/73831
Log:
progress with integrating the segmented Fusion work
Added:
trunk/boost/fusion/container/list/detail/reverse_cons.hpp
- copied unchanged from r73766, /trunk/boost/fusion/view/ext_/detail/reverse_cons.hpp
trunk/boost/fusion/iterator/segmented_iterator/
trunk/boost/fusion/iterator/segmented_iterator.hpp (contents, props changed)
trunk/boost/fusion/iterator/segmented_iterator/detail/
trunk/boost/fusion/iterator/segmented_iterator/detail/begin_impl.hpp
- copied, changed from r73766, /trunk/boost/fusion/view/ext_/detail/begin_impl.hpp
trunk/boost/fusion/iterator/segmented_iterator/detail/end_impl.hpp
- copied, changed from r73766, /trunk/boost/fusion/view/ext_/detail/end_impl.hpp
trunk/boost/fusion/iterator/segmented_iterator/detail/next_impl.hpp
- copied, changed from r73771, /trunk/boost/fusion/view/ext_/detail/next_impl.hpp
trunk/boost/fusion/iterator/segmented_iterator/detail/segment_sequence.hpp
- copied, changed from r73771, /trunk/boost/fusion/view/ext_/detail/segment_sequence.hpp
trunk/boost/fusion/iterator/segmented_iterator/segmented_iterator.hpp
- copied, changed from r73771, /trunk/boost/fusion/view/ext_/segmented_iterator.hpp
trunk/boost/fusion/sequence/intrinsic/detail/
trunk/boost/fusion/sequence/intrinsic/detail/segmented_begin.hpp
- copied, changed from r73771, /trunk/boost/fusion/view/ext_/segmented_begin.hpp
trunk/boost/fusion/sequence/intrinsic/detail/segmented_end.hpp
- copied, changed from r73771, /trunk/boost/fusion/view/ext_/segmented_end.hpp
trunk/boost/fusion/sequence/intrinsic/detail/segmented_size.hpp
- copied, changed from r73771, /trunk/boost/fusion/sequence/intrinsic/ext_/segmented_size.hpp
trunk/boost/fusion/sequence/intrinsic/segments.hpp
- copied, changed from r73766, /trunk/boost/fusion/sequence/intrinsic/ext_/segments.hpp
trunk/boost/fusion/support/is_segmented.hpp
- copied, changed from r73766, /trunk/boost/fusion/support/ext_/is_segmented.hpp
trunk/boost/fusion/support/segmented_fold_until.hpp
- copied, changed from r73766, /trunk/boost/fusion/view/ext_/segmented_fold_until.hpp
trunk/boost/fusion/view/iterator_range/detail/segmented_iterator_range.hpp
- copied, changed from r73771, /trunk/boost/fusion/view/ext_/segmented_iterator_range.hpp
Removed:
trunk/boost/fusion/sequence/intrinsic/ext_/
trunk/boost/fusion/support/ext_/
trunk/boost/fusion/view/ext_/
Text files modified:
trunk/boost/fusion/algorithm/iteration/ext_/fold_s.hpp | 2 +-
trunk/boost/fusion/algorithm/iteration/ext_/for_each_s.hpp | 2 +-
trunk/boost/fusion/algorithm/query/ext_/find_if_s.hpp | 2 +-
trunk/boost/fusion/algorithm/query/ext_/find_s.hpp | 2 +-
trunk/boost/fusion/container/ext_/tree.hpp | 12 ++++++------
trunk/boost/fusion/iterator.hpp | 1 +
trunk/boost/fusion/iterator/segmented_iterator/detail/begin_impl.hpp | 6 +++---
trunk/boost/fusion/iterator/segmented_iterator/detail/end_impl.hpp | 4 ++--
trunk/boost/fusion/iterator/segmented_iterator/detail/next_impl.hpp | 2 +-
trunk/boost/fusion/iterator/segmented_iterator/detail/segment_sequence.hpp | 4 ++--
trunk/boost/fusion/iterator/segmented_iterator/segmented_iterator.hpp | 10 +++++-----
trunk/boost/fusion/sequence/intrinsic.hpp | 1 +
trunk/boost/fusion/sequence/intrinsic/detail/segmented_begin.hpp | 2 +-
trunk/boost/fusion/sequence/intrinsic/detail/segmented_end.hpp | 2 +-
trunk/boost/fusion/sequence/intrinsic/detail/segmented_size.hpp | 4 ++--
trunk/boost/fusion/sequence/intrinsic/segments.hpp | 14 ++++++++++++++
trunk/boost/fusion/support.hpp | 1 +
trunk/boost/fusion/support/is_segmented.hpp | 17 ++++++++++-------
trunk/boost/fusion/support/segmented_fold_until.hpp | 4 ++--
trunk/boost/fusion/view/iterator_range/detail/segmented_iterator_range.hpp | 10 +++++-----
trunk/boost/proto/fusion.hpp | 8 ++++----
trunk/libs/fusion/test/sequence/ext_/iterator_range_s.cpp | 2 +-
22 files changed, 66 insertions(+), 46 deletions(-)
Modified: trunk/boost/fusion/algorithm/iteration/ext_/fold_s.hpp
==============================================================================
--- trunk/boost/fusion/algorithm/iteration/ext_/fold_s.hpp (original)
+++ trunk/boost/fusion/algorithm/iteration/ext_/fold_s.hpp 2011-08-16 19:07:51 EDT (Tue, 16 Aug 2011)
@@ -8,7 +8,7 @@
#define BOOST_FUSION_FOLD_S_HPP_INCLUDED
#include <boost/fusion/algorithm/iteration/fold.hpp>
-#include <boost/fusion/view/ext_/segmented_fold_until.hpp>
+#include <boost/fusion/support/segmented_fold_until.hpp>
namespace boost { namespace fusion { namespace detail
{
Modified: trunk/boost/fusion/algorithm/iteration/ext_/for_each_s.hpp
==============================================================================
--- trunk/boost/fusion/algorithm/iteration/ext_/for_each_s.hpp (original)
+++ trunk/boost/fusion/algorithm/iteration/ext_/for_each_s.hpp 2011-08-16 19:07:51 EDT (Tue, 16 Aug 2011)
@@ -9,7 +9,7 @@
#include <boost/fusion/support/void.hpp>
#include <boost/fusion/algorithm/iteration/for_each.hpp>
-#include <boost/fusion/view/ext_/segmented_fold_until.hpp>
+#include <boost/fusion/support/segmented_fold_until.hpp>
namespace boost { namespace fusion { namespace detail
{
Modified: trunk/boost/fusion/algorithm/query/ext_/find_if_s.hpp
==============================================================================
--- trunk/boost/fusion/algorithm/query/ext_/find_if_s.hpp (original)
+++ trunk/boost/fusion/algorithm/query/ext_/find_if_s.hpp 2011-08-16 19:07:51 EDT (Tue, 16 Aug 2011)
@@ -10,7 +10,7 @@
#include <boost/type_traits/remove_const.hpp>
#include <boost/fusion/algorithm/query/find_if.hpp>
#include <boost/fusion/sequence/intrinsic/end.hpp>
-#include <boost/fusion/view/ext_/segmented_fold_until.hpp>
+#include <boost/fusion/support/segmented_fold_until.hpp>
namespace boost { namespace fusion { namespace detail
{
Modified: trunk/boost/fusion/algorithm/query/ext_/find_s.hpp
==============================================================================
--- trunk/boost/fusion/algorithm/query/ext_/find_s.hpp (original)
+++ trunk/boost/fusion/algorithm/query/ext_/find_s.hpp 2011-08-16 19:07:51 EDT (Tue, 16 Aug 2011)
@@ -10,7 +10,7 @@
#include <boost/type_traits/remove_const.hpp>
#include <boost/fusion/algorithm/query/find.hpp>
#include <boost/fusion/sequence/intrinsic/end.hpp>
-#include <boost/fusion/view/ext_/segmented_fold_until.hpp>
+#include <boost/fusion/support/segmented_fold_until.hpp>
namespace boost { namespace fusion { namespace detail
{
Modified: trunk/boost/fusion/container/ext_/tree.hpp
==============================================================================
--- trunk/boost/fusion/container/ext_/tree.hpp (original)
+++ trunk/boost/fusion/container/ext_/tree.hpp 2011-08-16 19:07:51 EDT (Tue, 16 Aug 2011)
@@ -19,12 +19,12 @@
#include <boost/fusion/container/vector/vector10.hpp>
#include <boost/fusion/support/sequence_base.hpp>
#include <boost/fusion/support/category_of.hpp>
-#include <boost/fusion/sequence/intrinsic/ext_/segments.hpp>
-#include <boost/fusion/sequence/intrinsic/ext_/segmented_size.hpp>
-#include <boost/fusion/support/ext_/is_segmented.hpp>
-#include <boost/fusion/view/ext_/segmented_iterator.hpp>
-#include <boost/fusion/view/ext_/segmented_begin.hpp>
-#include <boost/fusion/view/ext_/segmented_end.hpp>
+#include <boost/fusion/sequence/intrinsic/segments.hpp>
+#include <boost/fusion/sequence/intrinsic/detail/segmented_size.hpp>
+#include <boost/fusion/support/is_segmented.hpp>
+#include <boost/fusion/iterator/segmented_iterator.hpp>
+#include <boost/fusion/sequence/intrinsic/detail/segmented_begin.hpp>
+#include <boost/fusion/sequence/intrinsic/detail/segmented_end.hpp>
namespace boost { namespace fusion
{
Modified: trunk/boost/fusion/iterator.hpp
==============================================================================
--- trunk/boost/fusion/iterator.hpp (original)
+++ trunk/boost/fusion/iterator.hpp 2011-08-16 19:07:51 EDT (Tue, 16 Aug 2011)
@@ -9,6 +9,7 @@
#include <boost/fusion/iterator/iterator_facade.hpp>
#include <boost/fusion/iterator/iterator_adapter.hpp>
+#include <boost/fusion/iterator/segmented_iterator.hpp>
#include <boost/fusion/iterator/advance.hpp>
#include <boost/fusion/iterator/deref.hpp>
#include <boost/fusion/iterator/distance.hpp>
Added: trunk/boost/fusion/iterator/segmented_iterator.hpp
==============================================================================
--- (empty file)
+++ trunk/boost/fusion/iterator/segmented_iterator.hpp 2011-08-16 19:07:51 EDT (Tue, 16 Aug 2011)
@@ -0,0 +1,12 @@
+/*=============================================================================
+ Copyright (c) 2011 Eric Niebler
+
+ Distributed under the Boost Software License, Version 1.0. (See accompanying
+ file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+==============================================================================*/
+#if !defined(BOOST_FUSION_SEGMENTED_ITERATOR_HPP_INCLUDED)
+#define BOOST_FUSION_SEGMENTED_ITERATOR_HPP_INCLUDED
+
+#include <boost/fusion/iterator/segmented_iterator/segmented_iterator.hpp>
+
+#endif
Copied: trunk/boost/fusion/iterator/segmented_iterator/detail/begin_impl.hpp (from r73766, /trunk/boost/fusion/view/ext_/detail/begin_impl.hpp)
==============================================================================
--- /trunk/boost/fusion/view/ext_/detail/begin_impl.hpp (original)
+++ trunk/boost/fusion/iterator/segmented_iterator/detail/begin_impl.hpp 2011-08-16 19:07:51 EDT (Tue, 16 Aug 2011)
@@ -13,9 +13,9 @@
#include <boost/fusion/container/generation/make_cons.hpp>
#include <boost/fusion/sequence/intrinsic/begin.hpp>
#include <boost/fusion/sequence/intrinsic/end.hpp>
-#include <boost/fusion/support/ext_/is_segmented.hpp>
-#include <boost/fusion/view/ext_/detail/end_impl.hpp>
-#include <boost/fusion/view/ext_/segmented_fold_until.hpp>
+#include <boost/fusion/support/is_segmented.hpp>
+#include <boost/fusion/iterator/segmented_iterator/detail/end_impl.hpp>
+#include <boost/fusion/support/segmented_fold_until.hpp>
namespace boost { namespace fusion { namespace detail
{
Copied: trunk/boost/fusion/iterator/segmented_iterator/detail/end_impl.hpp (from r73766, /trunk/boost/fusion/view/ext_/detail/end_impl.hpp)
==============================================================================
--- /trunk/boost/fusion/view/ext_/detail/end_impl.hpp (original)
+++ trunk/boost/fusion/iterator/segmented_iterator/detail/end_impl.hpp 2011-08-16 19:07:51 EDT (Tue, 16 Aug 2011)
@@ -13,8 +13,8 @@
#include <boost/fusion/view/iterator_range.hpp>
#include <boost/fusion/container/list/cons.hpp>
#include <boost/fusion/sequence/intrinsic/end.hpp>
-#include <boost/fusion/sequence/intrinsic/ext_/segments.hpp>
-#include <boost/fusion/support/ext_/is_segmented.hpp>
+#include <boost/fusion/sequence/intrinsic/segments.hpp>
+#include <boost/fusion/support/is_segmented.hpp>
namespace boost { namespace fusion { namespace detail
{
Copied: trunk/boost/fusion/iterator/segmented_iterator/detail/next_impl.hpp (from r73771, /trunk/boost/fusion/view/ext_/detail/next_impl.hpp)
==============================================================================
--- /trunk/boost/fusion/view/ext_/detail/next_impl.hpp (original)
+++ trunk/boost/fusion/iterator/segmented_iterator/detail/next_impl.hpp 2011-08-16 19:07:51 EDT (Tue, 16 Aug 2011)
@@ -13,7 +13,7 @@
#include <boost/fusion/container/list/cons.hpp>
#include <boost/fusion/iterator/next.hpp>
#include <boost/fusion/iterator/deref.hpp>
-#include <boost/fusion/view/ext_/detail/begin_impl.hpp>
+#include <boost/fusion/iterator/segmented_iterator/detail/begin_impl.hpp>
namespace boost { namespace fusion
{
Copied: trunk/boost/fusion/iterator/segmented_iterator/detail/segment_sequence.hpp (from r73771, /trunk/boost/fusion/view/ext_/detail/segment_sequence.hpp)
==============================================================================
--- /trunk/boost/fusion/view/ext_/detail/segment_sequence.hpp (original)
+++ trunk/boost/fusion/iterator/segmented_iterator/detail/segment_sequence.hpp 2011-08-16 19:07:51 EDT (Tue, 16 Aug 2011)
@@ -10,8 +10,8 @@
#include <boost/mpl/bool.hpp>
#include <boost/type_traits/remove_reference.hpp>
#include <boost/fusion/support/tag_of.hpp>
-#include <boost/fusion/sequence/intrinsic/ext_/segments.hpp>
-#include <boost/fusion/sequence/intrinsic/ext_/segmented_size.hpp>
+#include <boost/fusion/sequence/intrinsic/segments.hpp>
+#include <boost/fusion/sequence/intrinsic/detail/segmented_size.hpp>
namespace boost { namespace fusion
{
Copied: trunk/boost/fusion/iterator/segmented_iterator/segmented_iterator.hpp (from r73771, /trunk/boost/fusion/view/ext_/segmented_iterator.hpp)
==============================================================================
--- /trunk/boost/fusion/view/ext_/segmented_iterator.hpp (original)
+++ trunk/boost/fusion/iterator/segmented_iterator/segmented_iterator.hpp 2011-08-16 19:07:51 EDT (Tue, 16 Aug 2011)
@@ -4,8 +4,8 @@
Distributed under the Boost Software License, Version 1.0. (See accompanying
file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
==============================================================================*/
-#if !defined(BOOST_FUSION_SEGMENTED_ITERATOR_HPP_INCLUDED)
-#define BOOST_FUSION_SEGMENTED_ITERATOR_HPP_INCLUDED
+#if !defined(BOOST_FUSION_SEGMENTED_ITERATOR_SEGMENTED_ITERATOR_HPP_INCLUDED)
+#define BOOST_FUSION_SEGMENTED_ITERATOR_SEGMENTED_ITERATOR_HPP_INCLUDED
#include <boost/mpl/equal.hpp>
#include <boost/mpl/transform.hpp>
@@ -18,9 +18,9 @@
#include <boost/fusion/iterator/deref.hpp>
#include <boost/fusion/iterator/equal_to.hpp>
#include <boost/fusion/sequence/intrinsic/begin.hpp>
-#include <boost/fusion/view/ext_/detail/next_impl.hpp>
-#include <boost/fusion/view/ext_/segmented_begin.hpp>
-#include <boost/fusion/view/ext_/segmented_end.hpp>
+#include <boost/fusion/iterator/segmented_iterator/detail/next_impl.hpp>
+#include <boost/fusion/sequence/intrinsic/detail/segmented_begin.hpp>
+#include <boost/fusion/sequence/intrinsic/detail/segmented_end.hpp>
#include <boost/fusion/container/vector/convert.hpp>
namespace boost { namespace fusion
Modified: trunk/boost/fusion/sequence/intrinsic.hpp
==============================================================================
--- trunk/boost/fusion/sequence/intrinsic.hpp (original)
+++ trunk/boost/fusion/sequence/intrinsic.hpp 2011-08-16 19:07:51 EDT (Tue, 16 Aug 2011)
@@ -14,6 +14,7 @@
#include <boost/fusion/sequence/intrinsic/end.hpp>
#include <boost/fusion/sequence/intrinsic/front.hpp>
#include <boost/fusion/sequence/intrinsic/has_key.hpp>
+#include <boost/fusion/sequence/intrinsic/segments.hpp>
#include <boost/fusion/sequence/intrinsic/size.hpp>
#include <boost/fusion/sequence/intrinsic/value_at.hpp>
#include <boost/fusion/sequence/intrinsic/at_key.hpp>
Copied: trunk/boost/fusion/sequence/intrinsic/detail/segmented_begin.hpp (from r73771, /trunk/boost/fusion/view/ext_/segmented_begin.hpp)
==============================================================================
--- /trunk/boost/fusion/view/ext_/segmented_begin.hpp (original)
+++ trunk/boost/fusion/sequence/intrinsic/detail/segmented_begin.hpp 2011-08-16 19:07:51 EDT (Tue, 16 Aug 2011)
@@ -7,7 +7,7 @@
#if !defined(BOOST_FUSION_SEGMENTED_BEGIN_HPP_INCLUDED)
#define BOOST_FUSION_SEGMENTED_BEGIN_HPP_INCLUDED
-#include <boost/fusion/view/ext_/detail/begin_impl.hpp>
+#include <boost/fusion/iterator/segmented_iterator/detail/begin_impl.hpp>
namespace boost { namespace fusion
{
Copied: trunk/boost/fusion/sequence/intrinsic/detail/segmented_end.hpp (from r73771, /trunk/boost/fusion/view/ext_/segmented_end.hpp)
==============================================================================
--- /trunk/boost/fusion/view/ext_/segmented_end.hpp (original)
+++ trunk/boost/fusion/sequence/intrinsic/detail/segmented_end.hpp 2011-08-16 19:07:51 EDT (Tue, 16 Aug 2011)
@@ -8,7 +8,7 @@
#define BOOST_FUSION_SEGMENTED_END_HPP_INCLUDED
#include <boost/fusion/container/list/cons.hpp>
-#include <boost/fusion/view/ext_/detail/end_impl.hpp>
+#include <boost/fusion/iterator/segmented_iterator/detail/end_impl.hpp>
namespace boost { namespace fusion
{
Copied: trunk/boost/fusion/sequence/intrinsic/detail/segmented_size.hpp (from r73771, /trunk/boost/fusion/sequence/intrinsic/ext_/segmented_size.hpp)
==============================================================================
--- /trunk/boost/fusion/sequence/intrinsic/ext_/segmented_size.hpp (original)
+++ trunk/boost/fusion/sequence/intrinsic/detail/segmented_size.hpp 2011-08-16 19:07:51 EDT (Tue, 16 Aug 2011)
@@ -18,8 +18,8 @@
#include <boost/fusion/mpl/clear.hpp>
#include <boost/fusion/mpl/push_front.hpp>
#include <boost/fusion/sequence/intrinsic/size.hpp>
-#include <boost/fusion/sequence/intrinsic/ext_/segments.hpp>
-#include <boost/fusion/support/ext_/is_segmented.hpp>
+#include <boost/fusion/sequence/intrinsic/segments.hpp>
+#include <boost/fusion/support/is_segmented.hpp>
namespace boost { namespace fusion
{
Copied: trunk/boost/fusion/sequence/intrinsic/segments.hpp (from r73766, /trunk/boost/fusion/sequence/intrinsic/ext_/segments.hpp)
==============================================================================
--- /trunk/boost/fusion/sequence/intrinsic/ext_/segments.hpp (original)
+++ trunk/boost/fusion/sequence/intrinsic/segments.hpp 2011-08-16 19:07:51 EDT (Tue, 16 Aug 2011)
@@ -11,6 +11,10 @@
namespace boost { namespace fusion
{
+ // Special tags:
+ struct sequence_facade_tag;
+ struct iterator_range_tag;
+
// segments: returns a sequence of sequences
namespace extension
{
@@ -20,6 +24,16 @@
template <typename Sequence>
struct apply {};
};
+
+ template <>
+ struct segments_impl<sequence_facade_tag>
+ {
+ template <typename Sequence>
+ struct apply : Sequence::template segments<Sequence> {};
+ };
+
+ template <>
+ struct segments_impl<iterator_range_tag>;
}
namespace result_of
Modified: trunk/boost/fusion/support.hpp
==============================================================================
--- trunk/boost/fusion/support.hpp (original)
+++ trunk/boost/fusion/support.hpp 2011-08-16 19:07:51 EDT (Tue, 16 Aug 2011)
@@ -10,6 +10,7 @@
#include <boost/fusion/support/category_of.hpp>
#include <boost/fusion/support/is_iterator.hpp>
#include <boost/fusion/support/is_sequence.hpp>
+#include <boost/fusion/support/is_segmented.hpp>
#include <boost/fusion/support/iterator_base.hpp>
#include <boost/fusion/support/pair.hpp>
#include <boost/fusion/support/sequence_base.hpp>
Copied: trunk/boost/fusion/support/is_segmented.hpp (from r73766, /trunk/boost/fusion/support/ext_/is_segmented.hpp)
==============================================================================
--- /trunk/boost/fusion/support/ext_/is_segmented.hpp (original)
+++ trunk/boost/fusion/support/is_segmented.hpp 2011-08-16 19:07:51 EDT (Tue, 16 Aug 2011)
@@ -13,24 +13,27 @@
{
// Special tags:
struct sequence_facade_tag;
- struct boost_tuple_tag; // boost::tuples::tuple tag
- struct boost_array_tag; // boost::array tag
- struct mpl_sequence_tag; // mpl sequence tag
- struct std_pair_tag; // std::pair tag
struct iterator_range_tag;
namespace extension
{
- template<typename Tag>
+ template <typename Tag>
struct is_segmented_impl
{
- template<typename Sequence>
+ template <typename Sequence>
struct apply
: mpl::false_
{};
};
- template<>
+ template <>
+ struct is_segmented_impl<sequence_facade_tag>
+ {
+ template <typename Sequence>
+ struct apply : Sequence::is_segmented {};
+ };
+
+ template <>
struct is_segmented_impl<iterator_range_tag>;
}
Copied: trunk/boost/fusion/support/segmented_fold_until.hpp (from r73766, /trunk/boost/fusion/view/ext_/segmented_fold_until.hpp)
==============================================================================
--- /trunk/boost/fusion/view/ext_/segmented_fold_until.hpp (original)
+++ trunk/boost/fusion/support/segmented_fold_until.hpp 2011-08-16 19:07:51 EDT (Tue, 16 Aug 2011)
@@ -24,8 +24,8 @@
#include <boost/fusion/iterator/value_of.hpp>
#include <boost/fusion/iterator/equal_to.hpp>
#include <boost/fusion/iterator/next.hpp>
-#include <boost/fusion/support/ext_/is_segmented.hpp>
-#include <boost/fusion/sequence/intrinsic/ext_/segments.hpp>
+#include <boost/fusion/support/is_segmented.hpp>
+#include <boost/fusion/sequence/intrinsic/segments.hpp>
// fun(rng, state, context)
// rng: a non-segmented range
Copied: trunk/boost/fusion/view/iterator_range/detail/segmented_iterator_range.hpp (from r73771, /trunk/boost/fusion/view/ext_/segmented_iterator_range.hpp)
==============================================================================
--- /trunk/boost/fusion/view/ext_/segmented_iterator_range.hpp (original)
+++ trunk/boost/fusion/view/iterator_range/detail/segmented_iterator_range.hpp 2011-08-16 19:07:51 EDT (Tue, 16 Aug 2011)
@@ -15,15 +15,15 @@
#include <boost/fusion/sequence/intrinsic/end.hpp>
#include <boost/fusion/iterator/next.hpp>
#include <boost/fusion/iterator/deref.hpp>
-#include <boost/fusion/sequence/intrinsic/ext_/segments.hpp>
-#include <boost/fusion/sequence/intrinsic/ext_/segmented_size.hpp>
+#include <boost/fusion/sequence/intrinsic/segments.hpp>
+#include <boost/fusion/sequence/intrinsic/detail/segmented_size.hpp>
#include <boost/fusion/algorithm/transformation/push_back.hpp>
#include <boost/fusion/algorithm/transformation/push_front.hpp>
#include <boost/fusion/view/iterator_range.hpp>
#include <boost/fusion/iterator/equal_to.hpp>
-#include <boost/fusion/view/ext_/segmented_iterator.hpp>
-#include <boost/fusion/view/ext_/detail/reverse_cons.hpp>
-#include <boost/fusion/view/ext_/detail/segment_sequence.hpp>
+#include <boost/fusion/iterator/segmented_iterator.hpp>
+#include <boost/fusion/container/list/detail/reverse_cons.hpp>
+#include <boost/fusion/iterator/segmented_iterator/detail/segment_sequence.hpp>
// Invariants:
// - Each segmented iterator has a stack
Modified: trunk/boost/proto/fusion.hpp
==============================================================================
--- trunk/boost/proto/fusion.hpp (original)
+++ trunk/boost/proto/fusion.hpp 2011-08-16 19:07:51 EDT (Tue, 16 Aug 2011)
@@ -22,11 +22,11 @@
#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_/segmented_size.hpp>
+#include <boost/fusion/support/is_segmented.hpp>
+#include <boost/fusion/sequence/intrinsic/segments.hpp>
+#include <boost/fusion/sequence/intrinsic/detail/segmented_size.hpp>
#include <boost/fusion/sequence/comparison/enable_comparison.hpp>
-#include <boost/fusion/view/ext_/segmented_iterator.hpp>
+#include <boost/fusion/iterator/segmented_iterator.hpp>
#include <boost/proto/proto_fwd.hpp>
#include <boost/proto/traits.hpp>
#include <boost/proto/eval.hpp>
Modified: trunk/libs/fusion/test/sequence/ext_/iterator_range_s.cpp
==============================================================================
--- trunk/libs/fusion/test/sequence/ext_/iterator_range_s.cpp (original)
+++ trunk/libs/fusion/test/sequence/ext_/iterator_range_s.cpp 2011-08-16 19:07:51 EDT (Tue, 16 Aug 2011)
@@ -12,7 +12,7 @@
#include <boost/fusion/container/ext_/tree.hpp>
#include <boost/fusion/container/generation/make_vector.hpp>
#include <boost/fusion/view/iterator_range/iterator_range.hpp>
-#include <boost/fusion/view/ext_/segmented_iterator_range.hpp>
+#include <boost/fusion/view/iterator_range/detail/segmented_iterator_range.hpp>
#include <boost/fusion/sequence/comparison/equal_to.hpp>
#include <boost/fusion/sequence/io/out.hpp>
#include <boost/fusion/sequence/intrinsic/size.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