Branch for developing Bitten client/server testing

[SVN r41004]

doc/extension.qbk

@@ -1,5 +1,7 @@
 [section Extension]
 
+[section The Full Extension Mechanism]
+
 The Fusion library is designed to be extensible, new sequences types can easily
 be added. In fact, the library support for `std::pair`, `boost::array` and __mpl__ 
 sequences is entirely provided using the extension mechanism.
@@ -375,3 +377,122 @@ for a variety of types.
 
 [endsect]
 
+[section Macros]
+
+[section BOOST_FUSION_ADAPT_STRUCT]
+
+[heading Description]
+BOOST_FUSION_ADAPT_STRUCT is a macro that can be used to generate all the
+necessary boilerplate to make an arbitrary struct into a __random_access_sequence__.
+
+[heading Synopsis]
+    BOOST_FUSION_ADAPT_STRUCT(
+        struct_name
+        (member_type0, member_name0)
+        (member_type1, member_name1)
+        ...
+        )
+
+[heading Semantics]
+    BOOST_FUSION_ADAPT_STRUCT(
+        struct_name,
+        (member_type0, member_name0)
+        (member_type1, member_name1)
+        ...
+        )
+
+The above macro generates the necessary code to adapt `struct_name`
+as a model of __random_access_sequence__. The sequence of `(member_typeN, member_nameN)`
+pairs declare the type and names of each of the struct members that will be
+part of the sequence.
+
+The macro should be used at global scope, and `struct_name` should be the fully
+namespace qualified name of the struct to be converted.
+
+[heading Header]
+    #include <boost/fusion/adapted/struct/adapt_struct.hpp>
+
+[heading Example]
+    namespace demo
+    {
+        struct employee
+        {
+            std::string name;
+            int age;
+        };
+    }
+
+    // demo::employee is now a Fusion sequence
+    BOOST_FUSION_ADAPT_STRUCT(
+        demo::employee
+        (std::string, name)
+        (int, age))
+
+[endsect]
+
+[section BOOST_FUSION_ADAPT_ASSOC_STRUCT]
+
+[heading Description]
+BOOST_FUSION_ADAPT_ASSOC_STRUCT is a macro that can be used to generate all the
+necessary boilerplate to make an arbitrary struct into a model of  __random_access_sequence__
+and __associative_sequence__.
+
+[heading Synopsis]
+    BOOST_FUSION_ADAPT_ASSOC_STRUCT(
+        struct_name
+        (member_type0, member_name0, key_type0)
+        (member_type1, member_name1, key_type1)
+        ...
+        )
+
+[heading Semantics]
+    BOOST_FUSION_ADAPT_ASSOC_STRUCT(
+        struct_name
+        (member_type0, member_name0, key_type0)
+        (member_type1, member_name1, key_type1)
+        ...
+        )
+
+The above macro generates the necessary code to adapt `struct_name`
+as a model of __random_access_sequence__ and __associative_sequence__. 
+The sequence of `(member_typeN, member_nameN, key_typeN)`
+triples declare the type, name and key type of each of the struct members 
+that will be part of the sequence.
+
+The macro should be used at global scope, and `struct_name` should be the fully
+namespace qualified name of the struct to be converted.
+
+[heading Header]
+    #include <boost/fusion/adapted/struct/adapt_assoc_struct.hpp>
+
+[heading Example]
+    namespace demo
+    {
+        struct employee
+        {
+            std::string name;
+            int age;
+        };
+    }
+
+    namespace keys
+    {
+        struct name;
+        struct age;
+    }
+
+    // demo::employee is now a Fusion sequence
+    // It is also an associative sequence with
+    // keys keys::name and keys::age present.
+    BOOST_FUSION_ADAPT_ASSOC_STRUCT(
+        demo::employee
+        (std::string, name, keys::name)
+        (int, age, keys::age))
+
+
+[endsect]
+
+[endsect]
+
+[endsect]
+

example/cookbook/do_the_bind.cpp

@@ -28,7 +28,7 @@
 #include <boost/fusion/support/deduce_sequence.hpp>
 
 #include <boost/fusion/sequence/intrinsic/at.hpp>
-#include <boost/fusion/sequence/intrinsic/mpl.hpp>
+#include <boost/fusion/mpl.hpp>
 #include <boost/fusion/sequence/intrinsic/front.hpp>
 #include <boost/fusion/sequence/intrinsic/empty.hpp>
 #include <boost/fusion/algorithm/transformation/transform.hpp>

example/cookbook/fill_em_up.cpp

@@ -24,8 +24,8 @@
 ==============================================================================*/
 
 // We'll use these containers as examples
-#include <boost/fusion/sequence/container/list.hpp>
-#include <boost/fusion/sequence/container/vector.hpp>
+#include <boost/fusion/container/list.hpp>
+#include <boost/fusion/container/vector.hpp>
 
 // For doing I/O
 #include <boost/fusion/sequence/io.hpp>

example/performance/accumulate.cpp

@@ -10,10 +10,12 @@
 
 #include <boost/fusion/algorithm/iteration/accumulate.hpp>
 #include <boost/fusion/algorithm/transformation/transform.hpp>
-#include <boost/fusion/sequence/container/vector.hpp>
+#include <boost/fusion/container/vector.hpp>
 #include <boost/fusion/algorithm/transformation/zip.hpp>
 #include <boost/fusion/sequence/intrinsic/at.hpp>
-#include <boost/fusion/sequence/adapted/array.hpp>
+#include <boost/fusion/adapted/array.hpp>
+
+#include <boost/type_traits/remove_reference.hpp>
 
 #include <algorithm>
 #include <numeric>
@@ -75,14 +77,15 @@ namespace
         return result / iter;
     }
 
-
     struct poly_add
     {
+        template<typename Sig>
+        struct result;
+
         template<typename Lhs, typename Rhs>
-        struct result
-        {
-            typedef Lhs type;
-        };
+        struct result<poly_add(Lhs,Rhs)>
+            : boost::remove_reference<Lhs>
+        {};
 
         template<typename Lhs, typename Rhs>
         Lhs operator()(const Lhs& lhs, const Rhs& rhs) const
@@ -93,11 +96,13 @@ namespace
 
     struct poly_mult
     {
+        template<typename Sig>
+        struct result;
+
         template<typename Lhs, typename Rhs>
-        struct result
-        {
-            typedef Lhs type;
-        };
+        struct result<poly_mult(Lhs, Rhs)>
+            : boost::remove_reference<Lhs>
+        {};
 
         template<typename Lhs, typename Rhs>
         Lhs operator()(const Lhs& lhs, const Rhs& rhs) const

example/performance/functional.cpp

@@ -7,14 +7,14 @@
     http://www.boost.org/LICENSE_1_0.txt).
 ==============================================================================*/
 
-#include <boost/fusion/sequence/container/list.hpp>
-#include <boost/fusion/sequence/container/vector.hpp>
+#include <boost/fusion/container/list.hpp>
+#include <boost/fusion/container/vector.hpp>
 #include <boost/fusion/algorithm/iteration/fold.hpp>
 #include <boost/fusion/functional/adapter/unfused_generic.hpp>
 #include <boost/fusion/functional/adapter/unfused_rvalue_args.hpp>
 #include <boost/fusion/functional/adapter/fused_function_object.hpp>
-#include <boost/fusion/functional/adapter/unfused_typed.hpp>
 
+#include <boost/utility/result_of.hpp>
 #include <boost/config.hpp>
 #include <boost/timer.hpp>
 #include <algorithm>
@@ -264,12 +264,6 @@ int main()
         std::cout << "without random access                          " << call_fused(f,res) << std::endl;
         total += res;
     }
-    {
-        typedef boost::fusion::vector<int,int,int,int> s;
-        boost::fusion::unfused_typed<F,s> f;
-        std::cout << "unfused_typed<F,s>                             " << call_unfused(f,res) << std::endl;
-        total += res;
-    }
     {
         boost::fusion::unfused_rvalue_args<F> f;
         std::cout << "unfused_rvalue_args<F>                         " << call_unfused(f,res) << std::endl;
@@ -296,13 +290,6 @@ int main()
         std::cout << "without random access                          " << call_fused(f,res) << std::endl;
         total += res;
     }
-    std::cout << std::endl << "Loopback:" << std::endl;
-    {
-        typedef boost::fusion::vector<int,int,int,int> s;
-        boost::fusion::unfused_typed< boost::fusion::fused_function_object<U>, s > f;
-        std::cout << "unfused_typed<fused_function_object<U>,s >     " << call_unfused(f,res) << std::endl;
-        total += res;
-    }
     {
         boost::fusion::unfused_rvalue_args< boost::fusion::fused_function_object<U> > f;
         std::cout << "unfused_rvalue_args<fused_function_object<U> > " << call_unfused(f,res) << std::endl;

example/performance/inner_product.cpp

@@ -10,12 +10,14 @@
 
 #include <boost/fusion/algorithm/iteration/accumulate.hpp>
 #include <boost/fusion/algorithm/transformation/transform.hpp>
-#include <boost/fusion/sequence/container/vector.hpp>
+#include <boost/fusion/container/vector.hpp>
 #include <boost/fusion/algorithm/transformation/zip.hpp>
 #include <boost/fusion/sequence/intrinsic/at.hpp>
-#include <boost/fusion/sequence/adapted/array.hpp>
+#include <boost/fusion/adapted/array.hpp>
 #include <boost/fusion/sequence/intrinsic/at.hpp>
 
+#include <boost/type_traits/remove_reference.hpp>
+
 #include <algorithm>
 #include <numeric>
 #include <functional>
@@ -37,11 +39,13 @@ namespace
 {
     struct poly_add
     {
+        template<typename Sig>
+        struct result;
+
         template<typename Lhs, typename Rhs>
-        struct result
-        {
-            typedef Lhs type;
-        };
+        struct result<poly_add(Lhs, Rhs)>
+            : boost::remove_reference<Lhs>
+        {};
 
         template<typename Lhs, typename Rhs>
         Lhs operator()(const Lhs& lhs, const Rhs& rhs) const
@@ -52,11 +56,13 @@ namespace
 
     struct poly_mult
     {
+        template<typename Sig>
+        struct result;
+
         template<typename Lhs, typename Rhs>
-        struct result
-        {
-            typedef Lhs type;
-        };
+        struct result<poly_mult(Lhs, Rhs)>
+            : boost::remove_reference<Lhs>
+        {};
 
         template<typename Lhs, typename Rhs>
         Lhs operator()(const Lhs& lhs, const Rhs& rhs) const

example/performance/inner_product2.cpp

@@ -10,12 +10,14 @@
 
 #include <boost/fusion/algorithm/iteration/accumulate.hpp>
 #include <boost/fusion/algorithm/transformation/transform.hpp>
-#include <boost/fusion/sequence/container/vector.hpp>
+#include <boost/fusion/container/vector.hpp>
 #include <boost/fusion/algorithm/transformation/zip.hpp>
 #include <boost/fusion/sequence/intrinsic/at.hpp>
-#include <boost/fusion/sequence/adapted/array.hpp>
+#include <boost/fusion/adapted/array.hpp>
 #include <boost/fusion/sequence/intrinsic/at.hpp>
 
+#include <boost/type_traits/remove_reference.hpp>
+
 #include <algorithm>
 #include <numeric>
 #include <functional>
@@ -37,11 +39,13 @@ namespace
 {
     struct poly_add
     {
+        template<typename Sig>
+        struct result;
+
         template<typename Lhs, typename Rhs>
-        struct result
-        {
-            typedef Lhs type;
-        };
+        struct result<poly_add(Lhs, Rhs)>
+            : boost::remove_reference<Lhs>
+        {};
 
         template<typename Lhs, typename Rhs>
         Lhs operator()(const Lhs& lhs, const Rhs& rhs) const
@@ -52,11 +56,13 @@ namespace
 
     struct poly_mult
     {
+        template<typename Sig>
+        struct result;
+
         template<typename Lhs, typename Rhs>
-        struct result
-        {
-            typedef Lhs type;
-        };
+        struct result<poly_mult(Lhs, Rhs)>
+            : boost::remove_reference<Lhs>
+        {};
 
         template<typename Lhs, typename Rhs>
         Lhs operator()(const Lhs& lhs, const Rhs& rhs) const
@@ -110,14 +116,16 @@ namespace
 
     struct poly_combine
     {
+        template<typename Sig>
+        struct result;
+
         template<typename Lhs, typename Rhs>
-        struct result
-        {
-            typedef Rhs type;
-        };
+        struct result<poly_combine(Lhs, Rhs)>
+            : boost::remove_reference<Rhs>
+        {};
         
         template<typename Lhs, typename Rhs>
-        typename result<Lhs,Rhs>::type
+        typename result<poly_combine(Lhs,Rhs)>::type
         operator()(const Lhs& lhs, const Rhs& rhs) const
         {
             return rhs + boost::fusion::at_c<0>(lhs) * boost::fusion::at_c<1>(lhs);

example/performance/sequence_efficiency.cpp

@@ -10,8 +10,10 @@
 #define FUSION_MAX_VECTOR_SIZE 30
 
 #include <boost/fusion/algorithm/iteration/accumulate.hpp>
-#include <boost/fusion/sequence/container/vector.hpp>
-#include <boost/fusion/sequence/container/list.hpp>
+#include <boost/fusion/container/vector.hpp>
+#include <boost/fusion/container/list.hpp>
+
+#include <boost/type_traits/remove_reference.hpp>
 
 #include <boost/lexical_cast.hpp>
 #include <boost/preprocessor/stringize.hpp>
@@ -59,11 +61,13 @@ namespace
 {
     struct poly_add
     {
+        template<typename Sig>
+        struct result;
+
         template<typename Lhs, typename Rhs>
-        struct result
-        {
-            typedef Lhs type;
-        };
+        struct result<poly_add(Lhs, Rhs)>
+            : boost::remove_reference<Lhs>
+        {};
 
         template<typename Lhs, typename Rhs>
         Lhs operator()(const Lhs& lhs, const Rhs& rhs) const

example/performance/zip_efficiency.cpp

@@ -10,7 +10,7 @@
 
 #include <boost/fusion/algorithm/iteration/accumulate.hpp>
 #include <boost/fusion/algorithm/transformation/zip.hpp>
-#include <boost/fusion/sequence/container/vector.hpp>
+#include <boost/fusion/container/vector.hpp>
 #include <boost/fusion/sequence/intrinsic/value_at.hpp>
 #include <boost/fusion/sequence/intrinsic/at.hpp>
 #include <boost/type_traits/remove_reference.hpp>

include/boost/fusion/adapted.hpp

@@ -8,10 +8,10 @@
 #if !defined(BOOST_FUSION_ADAPTED_30122005_1420)
 #define BOOST_FUSION_ADAPTED_30122005_1420
 
-#include <boost/fusion/sequence/adapted/boost_tuple.hpp>
-#include <boost/fusion/sequence/adapted/std_pair.hpp>
-#include <boost/fusion/sequence/adapted/array.hpp>
-#include <boost/fusion/sequence/adapted/mpl.hpp>
-#include <boost/fusion/sequence/adapted/variant.hpp>
+#include <boost/fusion/adapted/boost_tuple.hpp>
+#include <boost/fusion/adapted/std_pair.hpp>
+#include <boost/fusion/adapted/array.hpp>
+#include <boost/fusion/adapted/mpl.hpp>
+#include <boost/fusion/adapted/variant.hpp>
 
 #endif

include/boost/fusion/adapted/array.hpp

@@ -0,0 +1,22 @@
+/*=============================================================================
+    Copyright (c) 2001-2006 Joel de Guzman
+    Copyright (c) 2005-2006 Dan Marsden
+
+    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_ARRAY_27122005_1035)
+#define BOOST_FUSION_ARRAY_27122005_1035
+
+#include <boost/fusion/adapted/array/array_iterator.hpp>
+#include <boost/fusion/adapted/array/tag_of.hpp>
+#include <boost/fusion/adapted/array/detail/is_view_impl.hpp>
+#include <boost/fusion/adapted/array/detail/is_sequence_impl.hpp>
+#include <boost/fusion/adapted/array/detail/category_of_impl.hpp>
+#include <boost/fusion/adapted/array/detail/begin_impl.hpp>
+#include <boost/fusion/adapted/array/detail/end_impl.hpp>
+#include <boost/fusion/adapted/array/detail/size_impl.hpp>
+#include <boost/fusion/adapted/array/detail/at_impl.hpp>
+#include <boost/fusion/adapted/array/detail/value_at_impl.hpp>
+
+#endif

include/boost/fusion/adapted/array/detail/begin_impl.hpp

@@ -8,7 +8,7 @@
 #if !defined(BOOST_FUSION_BEGIN_IMPL_27122005_1117)
 #define BOOST_FUSION_BEGIN_IMPL_27122005_1117
 
-#include <boost/fusion/sequence/adapted/array/array_iterator.hpp>
+#include <boost/fusion/adapted/array/array_iterator.hpp>
 
 namespace boost { namespace fusion {
 

include/boost/fusion/adapted/array/detail/end_impl.hpp

@@ -8,7 +8,7 @@
 #if !defined(BOOST_FUSION_END_IMPL_27122005_1120)
 #define BOOST_FUSION_END_IMPL_27122005_1120
 
-#include <boost/fusion/sequence/adapted/array/array_iterator.hpp>
+#include <boost/fusion/adapted/array/array_iterator.hpp>
 
 namespace boost { namespace fusion {
 

include/boost/fusion/adapted/boost_tuple.hpp

@@ -0,0 +1,20 @@
+/*=============================================================================
+    Copyright (c) 2001-2006 Joel de Guzman
+
+    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_BOOST_TUPLE_09272006_0732)
+#define BOOST_FUSION_BOOST_TUPLE_09272006_0732
+
+#include <boost/fusion/adapted/boost_tuple/tag_of.hpp>
+#include <boost/fusion/adapted/boost_tuple/detail/is_view_impl.hpp>
+#include <boost/fusion/adapted/boost_tuple/detail/is_sequence_impl.hpp>
+#include <boost/fusion/adapted/boost_tuple/detail/category_of_impl.hpp>
+#include <boost/fusion/adapted/boost_tuple/detail/begin_impl.hpp>
+#include <boost/fusion/adapted/boost_tuple/detail/end_impl.hpp>
+#include <boost/fusion/adapted/boost_tuple/detail/size_impl.hpp>
+#include <boost/fusion/adapted/boost_tuple/detail/at_impl.hpp>
+#include <boost/fusion/adapted/boost_tuple/detail/value_at_impl.hpp>
+
+#endif

include/boost/fusion/adapted/boost_tuple/detail/begin_impl.hpp

@@ -7,7 +7,7 @@
 #if !defined(BOOST_FUSION_BEGIN_IMPL_09272006_0719)
 #define BOOST_FUSION_BEGIN_IMPL_09272006_0719
 
-#include <boost/fusion/sequence/adapted/boost_tuple/boost_tuple_iterator.hpp>
+#include <boost/fusion/adapted/boost_tuple/boost_tuple_iterator.hpp>
 
 namespace boost { namespace fusion 
 {

include/boost/fusion/adapted/boost_tuple/detail/end_impl.hpp

@@ -7,7 +7,7 @@
 #if !defined(BOOST_FUSION_END_IMPL_09272006_0721)
 #define BOOST_FUSION_END_IMPL_09272006_0721
 
-#include <boost/fusion/sequence/adapted/boost_tuple/boost_tuple_iterator.hpp>
+#include <boost/fusion/adapted/boost_tuple/boost_tuple_iterator.hpp>
 #include <boost/mpl/if.hpp>
 #include <boost/type_traits/is_const.hpp>
 

include/boost/fusion/adapted/mpl.hpp

@@ -0,0 +1,21 @@
+/*=============================================================================
+    Copyright (c) 2001-2006 Joel de Guzman
+    Copyright (c) 2005-2006 Dan Marsden
+
+    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_MPL_31122005_1152)
+#define BOOST_FUSION_MPL_31122005_1152
+
+#include <boost/fusion/adapted/mpl/detail/begin_impl.hpp>
+#include <boost/fusion/adapted/mpl/detail/end_impl.hpp>
+#include <boost/fusion/adapted/mpl/detail/is_sequence_impl.hpp>
+#include <boost/fusion/adapted/mpl/detail/size_impl.hpp>
+#include <boost/fusion/adapted/mpl/detail/value_at_impl.hpp>
+#include <boost/fusion/adapted/mpl/detail/at_impl.hpp>
+#include <boost/fusion/adapted/mpl/detail/has_key_impl.hpp>
+#include <boost/fusion/adapted/mpl/detail/category_of_impl.hpp>
+#include <boost/fusion/adapted/mpl/detail/is_view_impl.hpp>
+
+#endif

include/boost/fusion/adapted/mpl/detail/begin_impl.hpp

@@ -8,7 +8,7 @@
 #if !defined(BOOST_FUSION_BEGIN_IMPL_31122005_1209)
 #define BOOST_FUSION_BEGIN_IMPL_31122005_1209
 
-#include <boost/fusion/sequence/adapted/mpl/mpl_iterator.hpp>
+#include <boost/fusion/adapted/mpl/mpl_iterator.hpp>
 #include <boost/mpl/begin.hpp>
 #include <boost/type_traits/remove_const.hpp>
 

include/boost/fusion/adapted/mpl/detail/end_impl.hpp

@@ -8,7 +8,7 @@
 #if !defined(BOOST_FUSION_END_IMPL_31122005_1237)
 #define BOOST_FUSION_END_IMPL_31122005_1237
 
-#include <boost/fusion/sequence/adapted/mpl/mpl_iterator.hpp>
+#include <boost/fusion/adapted/mpl/mpl_iterator.hpp>
 #include <boost/mpl/end.hpp>
 #include <boost/type_traits/add_const.hpp>
 

include/boost/fusion/adapted/std_pair.hpp

@@ -9,7 +9,7 @@
 #define BOOST_FUSION_STD_PAIR_24122005_1744
 
 #include <boost/fusion/support/tag_of_fwd.hpp>
-#include <boost/fusion/sequence/adapted/struct.hpp>
+#include <boost/fusion/adapted/struct.hpp>
 #include <boost/mpl/int.hpp>
 #include <utility>
 

include/boost/fusion/adapted/std_pair/detail/begin_impl.hpp

@@ -8,7 +8,7 @@
 #if !defined(BOOST_FUSION_BEGIN_IMPL_24122005_1752)
 #define BOOST_FUSION_BEGIN_IMPL_24122005_1752
 
-#include <boost/fusion/sequence/adapted/std_pair/std_pair_iterator.hpp>
+#include <boost/fusion/adapted/std_pair/std_pair_iterator.hpp>
 
 namespace boost { namespace fusion {
 

include/boost/fusion/adapted/std_pair/detail/end_impl.hpp

@@ -8,7 +8,7 @@
 #if !defined(BOOST_FUSION_END_IMPL_24122005_1755)
 #define BOOST_FUSION_END_IMPL_24122005_1755
 
-#include <boost/fusion/sequence/adapted/std_pair/std_pair_iterator.hpp>
+#include <boost/fusion/adapted/std_pair/std_pair_iterator.hpp>
 
 namespace boost { namespace fusion {
 

include/boost/fusion/adapted/struct.hpp

@@ -0,0 +1,23 @@
+/*=============================================================================
+    Copyright (c) 2001-2006 Joel de Guzman
+    Copyright (c) 2005-2006 Dan Marsden
+
+    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_STRUCT_24122005_1744)
+#define BOOST_FUSION_STD_STRUCT_24122005_1744
+
+#include <boost/fusion/adapted/struct/extension.hpp>
+#include <boost/fusion/adapted/struct/adapt_struct.hpp>
+#include <boost/fusion/adapted/struct/struct_iterator.hpp>
+#include <boost/fusion/adapted/struct/detail/is_view_impl.hpp>
+#include <boost/fusion/adapted/struct/detail/is_sequence_impl.hpp>
+#include <boost/fusion/adapted/struct/detail/category_of_impl.hpp>
+#include <boost/fusion/adapted/struct/detail/begin_impl.hpp>
+#include <boost/fusion/adapted/struct/detail/end_impl.hpp>
+#include <boost/fusion/adapted/struct/detail/size_impl.hpp>
+#include <boost/fusion/adapted/struct/detail/at_impl.hpp>
+#include <boost/fusion/adapted/struct/detail/value_at_impl.hpp>
+
+#endif

include/boost/fusion/adapted/struct/adapt_assoc_struct.hpp

@@ -9,19 +9,19 @@
 #define BOOST_FUSION_ADAPT_ASSOC_STRUCT_20070508_2207
 
 #include <boost/fusion/support/tag_of_fwd.hpp>
-#include <boost/fusion/sequence/adapted/struct/extension.hpp>
-#include <boost/fusion/sequence/adapted/struct/struct_iterator.hpp>
-#include <boost/fusion/sequence/adapted/struct/detail/is_view_impl.hpp>
-#include <boost/fusion/sequence/adapted/struct/detail/is_sequence_impl.hpp>
-#include <boost/fusion/sequence/adapted/struct/detail/category_of_impl.hpp>
-#include <boost/fusion/sequence/adapted/struct/detail/begin_impl.hpp>
-#include <boost/fusion/sequence/adapted/struct/detail/end_impl.hpp>
-#include <boost/fusion/sequence/adapted/struct/detail/size_impl.hpp>
-#include <boost/fusion/sequence/adapted/struct/detail/at_impl.hpp>
-#include <boost/fusion/sequence/adapted/struct/detail/value_at_impl.hpp>
-#include <boost/fusion/sequence/adapted/struct/detail/has_key_impl.hpp>
-#include <boost/fusion/sequence/adapted/struct/detail/at_key_impl.hpp>
-#include <boost/fusion/sequence/adapted/struct/detail/value_at_key_impl.hpp>
+#include <boost/fusion/adapted/struct/extension.hpp>
+#include <boost/fusion/adapted/struct/struct_iterator.hpp>
+#include <boost/fusion/adapted/struct/detail/is_view_impl.hpp>
+#include <boost/fusion/adapted/struct/detail/is_sequence_impl.hpp>
+#include <boost/fusion/adapted/struct/detail/category_of_impl.hpp>
+#include <boost/fusion/adapted/struct/detail/begin_impl.hpp>
+#include <boost/fusion/adapted/struct/detail/end_impl.hpp>
+#include <boost/fusion/adapted/struct/detail/size_impl.hpp>
+#include <boost/fusion/adapted/struct/detail/at_impl.hpp>
+#include <boost/fusion/adapted/struct/detail/value_at_impl.hpp>
+#include <boost/fusion/adapted/struct/detail/has_key_impl.hpp>
+#include <boost/fusion/adapted/struct/detail/at_key_impl.hpp>
+#include <boost/fusion/adapted/struct/detail/value_at_key_impl.hpp>
 
 #include <boost/preprocessor/cat.hpp>
 #include <boost/preprocessor/punctuation/comma_if.hpp>

include/boost/fusion/adapted/struct/adapt_struct.hpp

@@ -8,16 +8,16 @@
 #define BOOST_FUSION_ADAPT_STRUCT_APRIL_2_2007_1158AM
 
 #include <boost/fusion/support/tag_of_fwd.hpp>
-#include <boost/fusion/sequence/adapted/struct/extension.hpp>
-#include <boost/fusion/sequence/adapted/struct/struct_iterator.hpp>
-#include <boost/fusion/sequence/adapted/struct/detail/is_view_impl.hpp>
-#include <boost/fusion/sequence/adapted/struct/detail/is_sequence_impl.hpp>
-#include <boost/fusion/sequence/adapted/struct/detail/category_of_impl.hpp>
-#include <boost/fusion/sequence/adapted/struct/detail/begin_impl.hpp>
-#include <boost/fusion/sequence/adapted/struct/detail/end_impl.hpp>
-#include <boost/fusion/sequence/adapted/struct/detail/size_impl.hpp>
-#include <boost/fusion/sequence/adapted/struct/detail/at_impl.hpp>
-#include <boost/fusion/sequence/adapted/struct/detail/value_at_impl.hpp>
+#include <boost/fusion/adapted/struct/extension.hpp>
+#include <boost/fusion/adapted/struct/struct_iterator.hpp>
+#include <boost/fusion/adapted/struct/detail/is_view_impl.hpp>
+#include <boost/fusion/adapted/struct/detail/is_sequence_impl.hpp>
+#include <boost/fusion/adapted/struct/detail/category_of_impl.hpp>
+#include <boost/fusion/adapted/struct/detail/begin_impl.hpp>
+#include <boost/fusion/adapted/struct/detail/end_impl.hpp>
+#include <boost/fusion/adapted/struct/detail/size_impl.hpp>
+#include <boost/fusion/adapted/struct/detail/at_impl.hpp>
+#include <boost/fusion/adapted/struct/detail/value_at_impl.hpp>
 
 #include <boost/preprocessor/cat.hpp>
 #include <boost/preprocessor/punctuation/comma_if.hpp>

include/boost/fusion/adapted/struct/detail/begin_impl.hpp

@@ -8,7 +8,7 @@
 #if !defined(BOOST_FUSION_BEGIN_IMPL_24122005_1752)
 #define BOOST_FUSION_BEGIN_IMPL_24122005_1752
 
-#include <boost/fusion/sequence/adapted/struct/struct_iterator.hpp>
+#include <boost/fusion/adapted/struct/struct_iterator.hpp>
 
 namespace boost { namespace fusion
 {

include/boost/fusion/adapted/struct/detail/end_impl.hpp

@@ -8,7 +8,7 @@
 #if !defined(BOOST_FUSION_END_IMPL_24122005_1755)
 #define BOOST_FUSION_END_IMPL_24122005_1755
 
-#include <boost/fusion/sequence/adapted/struct/struct_iterator.hpp>
+#include <boost/fusion/adapted/struct/struct_iterator.hpp>
 
 namespace boost { namespace fusion
 {

include/boost/fusion/adapted/struct/struct_iterator.hpp

@@ -9,7 +9,7 @@
 #define FUSION_STRUCT_ITERATOR_APRIL_2_2007_1008AM
 
 #include <boost/fusion/iterator/iterator_facade.hpp>
-#include <boost/fusion/sequence/adapted/struct/extension.hpp>
+#include <boost/fusion/adapted/struct/extension.hpp>
 #include <boost/type_traits/is_const.hpp>
 #include <boost/type_traits/add_reference.hpp>
 #include <boost/mpl/assert.hpp>

include/boost/fusion/adapted/variant.hpp

@@ -0,0 +1,20 @@
+/*=============================================================================
+    Copyright (c) 2001-2006 Joel de Guzman
+    Copyright (c) 2005-2006 Dan Marsden
+
+    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_VARIANT_12112006_1614)
+#define BOOST_FUSION_VARIANT_12112006_1614
+
+#include <boost/fusion/adapted/variant/variant_iterator.hpp>
+#include <boost/fusion/adapted/variant/detail/is_view_impl.hpp>
+#include <boost/fusion/adapted/variant/detail/is_sequence_impl.hpp>
+#include <boost/fusion/adapted/variant/detail/category_of_impl.hpp>
+#include <boost/fusion/adapted/variant/tag_of.hpp>
+#include <boost/fusion/adapted/variant/detail/size_impl.hpp>
+#include <boost/fusion/adapted/variant/detail/begin_impl.hpp>
+#include <boost/fusion/adapted/variant/detail/end_impl.hpp>
+
+#endif

include/boost/fusion/algorithm/iteration/detail/fold.hpp

@@ -1,3 +1,10 @@
+/*=============================================================================
+    Copyright (c) 2001-2006 Joel de Guzman
+    Copyright (c) 2006 Dan Marsden
+
+    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_FOLD_HPP_20070528_1253)
 #define BOOST_FUSION_FOLD_HPP_20070528_1253
 
@@ -98,7 +105,7 @@ namespace detail
     struct unrolled_fold<3>
     {
         template<typename I0, typename State, typename F>
-        static typename result_of_unrolled_fold<I0, State, F, 3>::type 
+        static typename result_of_unrolled_fold<I0, State, F, 3>::type
         call(I0 const& i0, State const& state, F f)
         {
             typedef typename result_of::next<I0>::type I1;
@@ -113,7 +120,7 @@ namespace detail
     struct unrolled_fold<2>
     {
         template<typename I0, typename State, typename F>
-        static typename result_of_unrolled_fold<I0, State, F, 2>::type 
+        static typename result_of_unrolled_fold<I0, State, F, 2>::type
         call(I0 const& i0, State const& state, F f)
         {
             typedef typename result_of::next<I0>::type I1;
@@ -126,7 +133,7 @@ namespace detail
     struct unrolled_fold<1>
     {
         template<typename I0, typename State, typename F>
-        static typename result_of_unrolled_fold<I0, State, F, 1>::type 
+        static typename result_of_unrolled_fold<I0, State, F, 1>::type
         call(I0 const& i0, State const& state, F f)
         {
             return f(*i0, state);

include/boost/fusion/algorithm/query/ext_/find_if_s.hpp

@@ -14,10 +14,10 @@
 #include <boost/utility/enable_if.hpp>
 #include <boost/type_traits/is_same.hpp>
 #include <boost/fusion/algorithm/query/find_if.hpp>
-#include <boost/fusion/sequence/container/list/cons.hpp>
+#include <boost/fusion/container/list/cons.hpp>
 #include <boost/fusion/sequence/intrinsic/ext_/segments.hpp>
-#include <boost/fusion/sequence/view/ext_/segmented_iterator.hpp>
-#include <boost/fusion/sequence/view/ext_/segmented_iterator_range.hpp>
+#include <boost/fusion/view/ext_/segmented_iterator.hpp>
+#include <boost/fusion/view/ext_/segmented_iterator_range.hpp>
 #include <boost/fusion/support/ext_/is_segmented.hpp>
 
 // fwd declarations

include/boost/fusion/algorithm/transformation/clear.hpp

@@ -7,7 +7,7 @@
 #if !defined(FUSION_CLEAR_09172005_1127)
 #define FUSION_CLEAR_09172005_1127
 
-#include <boost/fusion/sequence/container/vector/vector10.hpp>
+#include <boost/fusion/container/vector/vector10.hpp>
 
 namespace boost { namespace fusion
 {

include/boost/fusion/algorithm/transformation/erase.hpp

@@ -1,20 +1,21 @@
 /*=============================================================================
     Copyright (c) 2001-2006 Joel de Guzman
 
-    Distributed under the Boost Software License, Version 1.0. (See accompanying 
+    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(FUSION_ERASE_07232005_0534)
 #define FUSION_ERASE_07232005_0534
 
-#include <boost/fusion/sequence/container/vector/vector10.hpp>
-#include <boost/fusion/sequence/view/joint_view/joint_view.hpp>
-#include <boost/fusion/sequence/view/iterator_range/iterator_range.hpp>
+#include <boost/fusion/iterator/equal_to.hpp>
+#include <boost/fusion/iterator/mpl/convert_iterator.hpp>
+#include <boost/fusion/container/vector/vector10.hpp>
+#include <boost/fusion/view/joint_view/joint_view.hpp>
+#include <boost/fusion/view/iterator_range/iterator_range.hpp>
 #include <boost/fusion/support/detail/as_fusion_element.hpp>
 #include <boost/fusion/sequence/intrinsic/begin.hpp>
 #include <boost/fusion/sequence/intrinsic/end.hpp>
-#include <boost/fusion/iterator/equal_to.hpp>
-#include <boost/fusion/iterator/mpl/convert_iterator.hpp>
+#include <boost/fusion/adapted/mpl/mpl_iterator.hpp>
 
 namespace boost { namespace fusion
 {
@@ -25,7 +26,7 @@ namespace boost { namespace fusion
         {
             typedef typename result_of::end<Sequence>::type seq_last_type;
             typedef typename convert_iterator<First>::type first_type;
-            typedef typename 
+            typedef typename
                 mpl::if_<
                     result_of::equal_to<first_type, seq_last_type>
                   , first_type
@@ -33,19 +34,19 @@ namespace boost { namespace fusion
                 >::type
             type;
 
-            static type 
+            static type
             call(First const& first, mpl::false_)
             {
                 return fusion::next(convert_iterator<First>::call(first));
             }
 
-            static type 
+            static type
             call(First const& first, mpl::true_)
             {
                 return convert_iterator<First>::call(first);
             }
 
-            static type 
+            static type
             call(First const& first)
             {
                 return call(first, result_of::equal_to<first_type, seq_last_type>());

include/boost/fusion/algorithm/transformation/filter.hpp

@@ -8,7 +8,7 @@
 #if !defined(FUSION_FILTER_02122005_1839)
 #define FUSION_FILTER_02122005_1839
 
-#include <boost/fusion/sequence/view/filter_view/filter_view.hpp>
+#include <boost/fusion/view/filter_view/filter_view.hpp>
 #include <boost/type_traits/is_same.hpp>
 
 namespace boost { namespace fusion

include/boost/fusion/algorithm/transformation/filter_if.hpp

@@ -7,7 +7,7 @@
 #if !defined(FUSION_FILTER_IF_07172005_0818)
 #define FUSION_FILTER_IF_07172005_0818
 
-#include <boost/fusion/sequence/view/filter_view/filter_view.hpp>
+#include <boost/fusion/view/filter_view/filter_view.hpp>
 
 namespace boost { namespace fusion
 {

include/boost/fusion/algorithm/transformation/insert.hpp

@@ -1,20 +1,21 @@
 /*=============================================================================
     Copyright (c) 2001-2006 Joel de Guzman
 
-    Distributed under the Boost Software License, Version 1.0. (See accompanying 
+    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(FUSION_INSERT_07222005_0730)
 #define FUSION_INSERT_07222005_0730
 
-#include <boost/fusion/sequence/container/vector/vector10.hpp>
-#include <boost/fusion/sequence/view/joint_view/joint_view.hpp>
-#include <boost/fusion/sequence/view/single_view/single_view.hpp>
-#include <boost/fusion/sequence/view/iterator_range/iterator_range.hpp>
 #include <boost/fusion/support/detail/as_fusion_element.hpp>
+#include <boost/fusion/iterator/mpl/convert_iterator.hpp>
+#include <boost/fusion/container/vector/vector10.hpp>
+#include <boost/fusion/view/joint_view/joint_view.hpp>
+#include <boost/fusion/view/single_view/single_view.hpp>
+#include <boost/fusion/view/iterator_range/iterator_range.hpp>
 #include <boost/fusion/sequence/intrinsic/begin.hpp>
 #include <boost/fusion/sequence/intrinsic/end.hpp>
-#include <boost/fusion/iterator/mpl/convert_iterator.hpp>
+#include <boost/fusion/adapted/mpl/mpl_iterator.hpp>
 
 namespace boost { namespace fusion
 {
@@ -42,7 +43,7 @@ namespace boost { namespace fusion
     insert(Sequence const& seq, Position const& pos, T const& x)
     {
         typedef result_of::insert<
-            Sequence const, Position, T> 
+            Sequence const, Position, T>
         result_of;
         typedef typename result_of::left_type left_type;
         typedef typename result_of::right_type right_type;

include/boost/fusion/algorithm/transformation/insert_range.hpp

@@ -1,19 +1,20 @@
 /*=============================================================================
     Copyright (c) 2001-2006 Joel de Guzman
 
-    Distributed under the Boost Software License, Version 1.0. (See accompanying 
+    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(FUSION_INSERT_RANGE_009172005_1147)
 #define FUSION_INSERT_RANGE_009172005_1147
 
-#include <boost/fusion/sequence/container/vector/vector10.hpp>
-#include <boost/fusion/sequence/view/joint_view/joint_view.hpp>
-#include <boost/fusion/sequence/view/iterator_range/iterator_range.hpp>
+#include <boost/fusion/iterator/mpl/convert_iterator.hpp>
+#include <boost/fusion/container/vector/vector10.hpp>
+#include <boost/fusion/view/joint_view/joint_view.hpp>
+#include <boost/fusion/view/iterator_range/iterator_range.hpp>
 #include <boost/fusion/support/detail/as_fusion_element.hpp>
 #include <boost/fusion/sequence/intrinsic/begin.hpp>
 #include <boost/fusion/sequence/intrinsic/end.hpp>
-#include <boost/fusion/iterator/mpl/convert_iterator.hpp>
+#include <boost/fusion/adapted/mpl/mpl_iterator.hpp>
 
 namespace boost { namespace fusion
 {

include/boost/fusion/algorithm/transformation/join.hpp

@@ -8,7 +8,7 @@
 #if !defined(FUSION_JOIN_200601222109)
 #define FUSION_JOIN_200601222109
 
-#include <boost/fusion/sequence/view/joint_view.hpp>
+#include <boost/fusion/view/joint_view.hpp>
 
 namespace boost { namespace fusion {
 

include/boost/fusion/algorithm/transformation/pop_back.hpp

@@ -7,7 +7,7 @@
 #if !defined(FUSION_POP_BACK_09172005_1038)
 #define FUSION_POP_BACK_09172005_1038
 
-#include <boost/fusion/sequence/view/iterator_range/iterator_range.hpp>
+#include <boost/fusion/view/iterator_range/iterator_range.hpp>
 #include <boost/fusion/sequence/intrinsic/begin.hpp>
 #include <boost/fusion/sequence/intrinsic/end.hpp>
 #include <boost/fusion/iterator/prior.hpp>

include/boost/fusion/algorithm/transformation/pop_front.hpp

@@ -7,7 +7,7 @@
 #if !defined(FUSION_POP_FRONT_09172005_1115)
 #define FUSION_POP_FRONT_09172005_1115
 
-#include <boost/fusion/sequence/view/iterator_range/iterator_range.hpp>
+#include <boost/fusion/view/iterator_range/iterator_range.hpp>
 #include <boost/fusion/sequence/intrinsic/begin.hpp>
 #include <boost/fusion/sequence/intrinsic/end.hpp>
 #include <boost/fusion/iterator/next.hpp>

include/boost/fusion/algorithm/transformation/push_back.hpp

@@ -8,8 +8,8 @@
 #define FUSION_PUSH_BACK_07162005_0235
 
 #include <boost/fusion/support/detail/as_fusion_element.hpp>
-#include <boost/fusion/sequence/view/joint_view/joint_view.hpp>
-#include <boost/fusion/sequence/view/single_view/single_view.hpp>
+#include <boost/fusion/view/joint_view/joint_view.hpp>
+#include <boost/fusion/view/single_view/single_view.hpp>
 
 namespace boost { namespace fusion
 {

include/boost/fusion/algorithm/transformation/push_front.hpp

@@ -8,8 +8,8 @@
 #define FUSION_PUSH_FRONT_07162005_0749
 
 #include <boost/fusion/support/detail/as_fusion_element.hpp>
-#include <boost/fusion/sequence/view/joint_view/joint_view.hpp>
-#include <boost/fusion/sequence/view/single_view/single_view.hpp>
+#include <boost/fusion/view/joint_view/joint_view.hpp>
+#include <boost/fusion/view/single_view/single_view.hpp>
 
 namespace boost { namespace fusion
 {

include/boost/fusion/algorithm/transformation/remove.hpp

@@ -7,7 +7,7 @@
 #if !defined(FUSION_REMOVE_07162005_0818)
 #define FUSION_REMOVE_07162005_0818
 
-#include <boost/fusion/sequence/view/filter_view/filter_view.hpp>
+#include <boost/fusion/view/filter_view/filter_view.hpp>
 #include <boost/mpl/not.hpp>
 #include <boost/type_traits/is_same.hpp>
 

include/boost/fusion/algorithm/transformation/remove_if.hpp

@@ -7,7 +7,7 @@
 #if !defined(FUSION_REMOVE_IF_07162005_0818)
 #define FUSION_REMOVE_IF_07162005_0818
 
-#include <boost/fusion/sequence/view/filter_view/filter_view.hpp>
+#include <boost/fusion/view/filter_view/filter_view.hpp>
 #include <boost/mpl/not.hpp>
 #include <boost/type_traits/is_same.hpp>
 

include/boost/fusion/algorithm/transformation/replace.hpp

@@ -7,7 +7,7 @@
 #if !defined(FUSION_REPLACE_08182005_0830)
 #define FUSION_REPLACE_08182005_0830
 
-#include <boost/fusion/sequence/view/transform_view/transform_view.hpp>
+#include <boost/fusion/view/transform_view/transform_view.hpp>
 #include <boost/fusion/algorithm/transformation/detail/replace.hpp>
 
 namespace boost { namespace fusion

include/boost/fusion/algorithm/transformation/replace_if.hpp

@@ -7,7 +7,7 @@
 #if !defined(FUSION_REPLACE_IF_08182005_0939)
 #define FUSION_REPLACE_IF_08182005_0939
 
-#include <boost/fusion/sequence/view/transform_view/transform_view.hpp>
+#include <boost/fusion/view/transform_view/transform_view.hpp>
 #include <boost/fusion/algorithm/transformation/detail/replace_if.hpp>
 #include <boost/utility/enable_if.hpp>
 #include <boost/type_traits/is_same.hpp>

include/boost/fusion/algorithm/transformation/reverse.hpp

@@ -7,7 +7,7 @@
 #if !defined(FUSION_REVERSE_07212005_1230)
 #define FUSION_REVERSE_07212005_1230
 
-#include <boost/fusion/sequence/view/reverse_view/reverse_view.hpp>
+#include <boost/fusion/view/reverse_view/reverse_view.hpp>
 
 namespace boost { namespace fusion
 {

include/boost/fusion/algorithm/transformation/transform.hpp

@@ -7,7 +7,7 @@
 #if !defined(FUSION_TRANSFORM_07052005_1057)
 #define FUSION_TRANSFORM_07052005_1057
 
-#include <boost/fusion/sequence/view/transform_view/transform_view.hpp>
+#include <boost/fusion/view/transform_view/transform_view.hpp>
 
 namespace boost { namespace fusion
 {

include/boost/fusion/algorithm/transformation/zip.hpp

@@ -9,10 +9,10 @@
 #if !defined(FUSION_ZIP_HPP_20060125_2058)
 #define FUSION_ZIP_HPP_20060125_2058
 
-#include <boost/fusion/sequence/view/zip_view.hpp>
-#include <boost/fusion/sequence/adapted/mpl.hpp>
-#include <boost/fusion/sequence/container/vector.hpp>
-#include <boost/fusion/sequence/conversion/as_vector.hpp>
+#include <boost/fusion/view/zip_view.hpp>
+#include <boost/fusion/adapted/mpl.hpp>
+#include <boost/fusion/container/vector.hpp>
+#include <boost/fusion/container/vector/convert.hpp>
 #include <boost/type_traits/add_reference.hpp>
 #include <boost/preprocessor/repetition/enum.hpp>
 #include <boost/preprocessor/repetition/enum_params.hpp>