Patches for Codegear C++ Builder 2009

[SVN r48981]

test/Jamfile

@@ -81,7 +81,6 @@ import testing ;
     [ run sequence/single_view.cpp :  :  :  : ]
     [ run sequence/std_pair.cpp :  :  :  : ]
     [ run sequence/array.cpp :  :  :  : ]
-    [ run sequence/variant.cpp :  :  :  : ]
     [ run sequence/tuple_comparison.cpp :  :  :  : ]
     [ run sequence/tuple_construction.cpp :  :  :  : ]
     [ run sequence/tuple_copy.cpp :  :  :  : ]
@@ -90,6 +89,7 @@ import testing ;
     [ run sequence/tuple_misc.cpp :  :  :  : ]
     [ run sequence/tuple_mutate.cpp :  :  :  : ]
     [ run sequence/tuple_tie.cpp :  :  :  : ]
+    [ run sequence/tr1_tuple_auto_conv.cpp :  :  :  : ]
     [ run sequence/transform_view.cpp :  :  :  : ]
     [ run sequence/vector_comparison.cpp :  :  :  : ]
     [ run sequence/vector_construction.cpp :  :  :  : ]

test/algorithm/all.cpp

@@ -6,8 +6,8 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/fusion/sequence/container/vector/vector.hpp>
-#include <boost/fusion/sequence/adapted/mpl.hpp>
+#include <boost/fusion/container/vector/vector.hpp>
+#include <boost/fusion/adapted/mpl.hpp>
 #include <boost/fusion/algorithm/query/all.hpp>
 #include <boost/lambda/lambda.hpp>
 #include <boost/mpl/vector_c.hpp>

test/algorithm/any.cpp

@@ -7,8 +7,8 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/fusion/sequence/container/vector/vector.hpp>
-#include <boost/fusion/sequence/adapted/mpl.hpp>
+#include <boost/fusion/container/vector/vector.hpp>
+#include <boost/fusion/adapted/mpl.hpp>
 #include <boost/fusion/algorithm/query/any.hpp>
 #include <boost/lambda/lambda.hpp>
 #include <boost/mpl/vector_c.hpp>

test/algorithm/clear.cpp

@@ -5,10 +5,10 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/fusion/sequence/container/vector/vector.hpp>
+#include <boost/fusion/container/vector/vector.hpp>
 #include <boost/fusion/sequence/io/out.hpp>
 #include <boost/fusion/sequence/comparison/equal_to.hpp>
-#include <boost/fusion/sequence/generation/make_vector.hpp>
+#include <boost/fusion/container/generation/make_vector.hpp>
 #include <boost/fusion/algorithm/transformation/clear.hpp>
 #include <boost/mpl/vector_c.hpp>
 

test/algorithm/count.cpp

@@ -6,8 +6,8 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/fusion/sequence/container/vector/vector.hpp>
-#include <boost/fusion/sequence/adapted/mpl.hpp>
+#include <boost/fusion/container/vector/vector.hpp>
+#include <boost/fusion/adapted/mpl.hpp>
 #include <boost/fusion/algorithm/query/count.hpp>
 #include <boost/mpl/vector_c.hpp>
 #include <string>

test/algorithm/count_if.cpp

@@ -6,8 +6,8 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/fusion/sequence/container/vector/vector.hpp>
-#include <boost/fusion/sequence/adapted/mpl.hpp>
+#include <boost/fusion/container/vector/vector.hpp>
+#include <boost/fusion/adapted/mpl.hpp>
 #include <boost/fusion/algorithm/query/count_if.hpp>
 #include <boost/lambda/lambda.hpp>
 #include <boost/mpl/vector_c.hpp>

test/algorithm/erase.cpp

@@ -5,12 +5,12 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/fusion/sequence/container/vector/vector.hpp>
-#include <boost/fusion/sequence/container/vector/vector_iterator.hpp>
-#include <boost/fusion/sequence/adapted/mpl.hpp>
+#include <boost/fusion/container/vector/vector.hpp>
+#include <boost/fusion/container/vector/vector_iterator.hpp>
+#include <boost/fusion/adapted/mpl.hpp>
 #include <boost/fusion/sequence/io/out.hpp>
 #include <boost/fusion/sequence/comparison/equal_to.hpp>
-#include <boost/fusion/sequence/generation/make_vector.hpp>
+#include <boost/fusion/container/generation/make_vector.hpp>
 #include <boost/fusion/algorithm/transformation/erase.hpp>
 #include <boost/mpl/vector_c.hpp>
 #include <boost/mpl/begin_end.hpp>

test/algorithm/erase_key.cpp

@@ -5,15 +5,15 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/fusion/sequence/container/set/set.hpp>
-#include <boost/fusion/sequence/generation/make_set.hpp>
-#include <boost/fusion/sequence/container/map/map.hpp>
-#include <boost/fusion/sequence/generation/make_map.hpp>
+#include <boost/fusion/container/set/set.hpp>
+#include <boost/fusion/container/generation/make_set.hpp>
+#include <boost/fusion/container/map/map.hpp>
+#include <boost/fusion/container/generation/make_map.hpp>
 #include <boost/fusion/sequence/comparison/equal_to.hpp>
-#include <boost/fusion/sequence/conversion/as_vector.hpp>
-#include <boost/fusion/sequence/conversion/as_set.hpp>
-#include <boost/fusion/sequence/conversion/as_map.hpp>
-#include <boost/fusion/sequence/generation/make_vector.hpp>
+#include <boost/fusion/container/vector/convert.hpp>
+#include <boost/fusion/container/set/convert.hpp>
+#include <boost/fusion/container/map/convert.hpp>
+#include <boost/fusion/container/generation/make_vector.hpp>
 #include <boost/fusion/sequence/intrinsic/size.hpp>
 #include <boost/fusion/iterator/deref.hpp>
 #include <boost/fusion/algorithm/transformation/erase_key.hpp>

test/algorithm/ext_/find_if_s.cpp

@@ -5,12 +5,12 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/fusion/sequence/container/vector/vector.hpp>
-#include <boost/fusion/sequence/adapted/mpl.hpp>
+#include <boost/fusion/container/vector/vector.hpp>
+#include <boost/fusion/adapted/mpl.hpp>
 #include <boost/fusion/sequence/io/out.hpp>
 #include <boost/fusion/algorithm/query/ext_/find_if_s.hpp>
-#include <boost/fusion/sequence/container/ext_/tree.hpp>
-#include <boost/fusion/sequence/generation/make_vector.hpp>
+#include <boost/fusion/container/ext_/tree.hpp>
+#include <boost/fusion/container/generation/make_vector.hpp>
 #include <boost/mpl/vector.hpp>
 #include <boost/mpl/vector_c.hpp>
 #include <boost/mpl/less.hpp>

test/algorithm/ext_/for_each_s.cpp

@@ -5,13 +5,13 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/fusion/sequence/container/vector/vector.hpp>
-#include <boost/fusion/sequence/adapted/mpl.hpp>
+#include <boost/fusion/container/vector/vector.hpp>
+#include <boost/fusion/adapted/mpl.hpp>
 #include <boost/fusion/sequence/io/out.hpp>
 #include <boost/fusion/algorithm/iteration/ext_/for_each_s.hpp>
 #include <boost/mpl/vector_c.hpp>
-#include <boost/fusion/sequence/generation/make_vector.hpp>
-#include <boost/fusion/sequence/container/ext_/tree.hpp>
+#include <boost/fusion/container/generation/make_vector.hpp>
+#include <boost/fusion/container/ext_/tree.hpp>
 
 struct print
 {

test/algorithm/filter.cpp

@@ -6,10 +6,10 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/fusion/sequence/container/vector/vector.hpp>
-#include <boost/fusion/sequence/adapted/mpl.hpp>
+#include <boost/fusion/container/vector/vector.hpp>
+#include <boost/fusion/adapted/mpl.hpp>
 #include <boost/fusion/sequence/io/out.hpp>
-#include <boost/fusion/sequence/generation/make_vector.hpp>
+#include <boost/fusion/container/generation/make_vector.hpp>
 #include <boost/fusion/sequence/comparison/equal_to.hpp>
 #include <boost/fusion/algorithm/transformation/filter.hpp>
 #include <boost/mpl/vector.hpp>

test/algorithm/filter_if.cpp

@@ -5,10 +5,10 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/fusion/sequence/container/vector/vector.hpp>
-#include <boost/fusion/sequence/adapted/mpl.hpp>
+#include <boost/fusion/container/vector/vector.hpp>
+#include <boost/fusion/adapted/mpl.hpp>
 #include <boost/fusion/sequence/io/out.hpp>
-#include <boost/fusion/sequence/generation/make_vector.hpp>
+#include <boost/fusion/container/generation/make_vector.hpp>
 #include <boost/fusion/sequence/comparison/equal_to.hpp>
 #include <boost/fusion/algorithm/transformation/filter_if.hpp>
 #include <boost/type_traits/is_class.hpp>

test/algorithm/find.cpp

@@ -5,10 +5,10 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/fusion/sequence/container/vector/vector.hpp>
-#include <boost/fusion/sequence/adapted/mpl.hpp>
-#include <boost/fusion/sequence/container/set/set.hpp>
-#include <boost/fusion/sequence/container/map/map.hpp>
+#include <boost/fusion/container/vector/vector.hpp>
+#include <boost/fusion/adapted/mpl.hpp>
+#include <boost/fusion/container/set/set.hpp>
+#include <boost/fusion/container/map/map.hpp>
 #include <boost/fusion/algorithm/query/find.hpp>
 #include <boost/fusion/iterator/deref.hpp>
 #include <boost/mpl/vector.hpp>

test/algorithm/find_if.cpp

@@ -5,8 +5,8 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/fusion/sequence/container/vector/vector.hpp>
-#include <boost/fusion/sequence/adapted/mpl.hpp>
+#include <boost/fusion/container/vector/vector.hpp>
+#include <boost/fusion/adapted/mpl.hpp>
 #include <boost/fusion/sequence/io/out.hpp>
 #include <boost/fusion/algorithm/query/find_if.hpp>
 #include <boost/mpl/vector.hpp>

test/algorithm/fold.cpp

@@ -6,11 +6,11 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/fusion/sequence/container/vector/vector.hpp>
-#include <boost/fusion/sequence/adapted/mpl.hpp>
+#include <boost/fusion/container/vector/vector.hpp>
+#include <boost/fusion/adapted/mpl.hpp>
 #include <boost/fusion/sequence/io/out.hpp>
 #include <boost/fusion/sequence/intrinsic/at.hpp>
-#include <boost/fusion/sequence/generation/make_vector.hpp>
+#include <boost/fusion/container/generation/make_vector.hpp>
 #include <boost/fusion/algorithm/iteration/fold.hpp>
 #include <boost/fusion/algorithm/iteration/accumulate.hpp>
 #include <boost/type_traits/is_same.hpp>

test/algorithm/for_each.cpp

@@ -5,8 +5,8 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/fusion/sequence/container/vector/vector.hpp>
-#include <boost/fusion/sequence/adapted/mpl.hpp>
+#include <boost/fusion/container/vector/vector.hpp>
+#include <boost/fusion/adapted/mpl.hpp>
 #include <boost/fusion/sequence/io/out.hpp>
 #include <boost/fusion/algorithm/iteration/for_each.hpp>
 #include <boost/mpl/vector_c.hpp>

test/algorithm/insert.cpp

@@ -5,11 +5,11 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/fusion/sequence/container/vector/vector.hpp>
-#include <boost/fusion/sequence/adapted/mpl.hpp>
+#include <boost/fusion/container/vector/vector.hpp>
+#include <boost/fusion/adapted/mpl.hpp>
 #include <boost/fusion/sequence/io/out.hpp>
 #include <boost/fusion/sequence/comparison/equal_to.hpp>
-#include <boost/fusion/sequence/generation/make_vector.hpp>
+#include <boost/fusion/container/generation/make_vector.hpp>
 #include <boost/fusion/algorithm/transformation/insert.hpp>
 #include <boost/mpl/vector_c.hpp>
 #include <boost/mpl/begin_end.hpp>

test/algorithm/insert_range.cpp

@@ -5,11 +5,11 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/fusion/sequence/container/vector/vector.hpp>
-#include <boost/fusion/sequence/adapted/mpl.hpp>
+#include <boost/fusion/container/vector/vector.hpp>
+#include <boost/fusion/adapted/mpl.hpp>
 #include <boost/fusion/sequence/io/out.hpp>
 #include <boost/fusion/sequence/comparison/equal_to.hpp>
-#include <boost/fusion/sequence/generation/make_vector.hpp>
+#include <boost/fusion/container/generation/make_vector.hpp>
 #include <boost/fusion/algorithm/transformation/insert_range.hpp>
 #include <boost/mpl/vector_c.hpp>
 #include <boost/mpl/begin_end.hpp>

test/algorithm/join.cpp

@@ -7,9 +7,9 @@
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
 #include <boost/fusion/algorithm/transformation/join.hpp>
-#include <boost/fusion/sequence/generation/make_vector.hpp>
+#include <boost/fusion/container/generation/make_vector.hpp>
 #include <boost/fusion/sequence/comparison/equal_to.hpp>
-#include <boost/fusion/sequence/adapted/mpl.hpp>
+#include <boost/fusion/adapted/mpl.hpp>
 #include <boost/mpl/vector/vector10_c.hpp>
 
 int main()

test/algorithm/none.cpp

@@ -6,8 +6,8 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/fusion/sequence/container/vector/vector.hpp>
-#include <boost/fusion/sequence/adapted/mpl.hpp>
+#include <boost/fusion/container/vector/vector.hpp>
+#include <boost/fusion/adapted/mpl.hpp>
 #include <boost/fusion/algorithm/query/none.hpp>
 #include <boost/lambda/lambda.hpp>
 #include <boost/mpl/vector_c.hpp>

test/algorithm/pop_back.cpp

@@ -5,11 +5,11 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/fusion/sequence/container/vector/vector.hpp>
-#include <boost/fusion/sequence/adapted/mpl.hpp>
+#include <boost/fusion/container/vector/vector.hpp>
+#include <boost/fusion/adapted/mpl.hpp>
 #include <boost/fusion/sequence/io/out.hpp>
 #include <boost/fusion/sequence/comparison/equal_to.hpp>
-#include <boost/fusion/sequence/generation/make_vector.hpp>
+#include <boost/fusion/container/generation/make_vector.hpp>
 #include <boost/fusion/algorithm/transformation/pop_back.hpp>
 #include <boost/mpl/vector_c.hpp>
 

test/algorithm/pop_front.cpp

@@ -5,11 +5,11 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/fusion/sequence/container/vector/vector.hpp>
-#include <boost/fusion/sequence/adapted/mpl.hpp>
+#include <boost/fusion/container/vector/vector.hpp>
+#include <boost/fusion/adapted/mpl.hpp>
 #include <boost/fusion/sequence/io/out.hpp>
 #include <boost/fusion/sequence/comparison/equal_to.hpp>
-#include <boost/fusion/sequence/generation/make_vector.hpp>
+#include <boost/fusion/container/generation/make_vector.hpp>
 #include <boost/fusion/algorithm/transformation/pop_front.hpp>
 #include <boost/mpl/vector_c.hpp>
 

test/algorithm/push_back.cpp

@@ -5,12 +5,12 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/fusion/sequence/container/vector/vector.hpp>
-#include <boost/fusion/sequence/adapted/mpl.hpp>
+#include <boost/fusion/container/vector/vector.hpp>
+#include <boost/fusion/adapted/mpl.hpp>
 #include <boost/fusion/sequence/io/out.hpp>
 #include <boost/fusion/sequence/comparison/equal_to.hpp>
 #include <boost/fusion/sequence/intrinsic/at.hpp>
-#include <boost/fusion/sequence/generation/make_vector.hpp>
+#include <boost/fusion/container/generation/make_vector.hpp>
 #include <boost/fusion/algorithm/transformation/push_back.hpp>
 #include <boost/fusion/algorithm/iteration/for_each.hpp>
 #include <boost/mpl/vector_c.hpp>

test/algorithm/push_front.cpp

@@ -5,11 +5,11 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/fusion/sequence/container/vector/vector.hpp>
-#include <boost/fusion/sequence/adapted/mpl.hpp>
+#include <boost/fusion/container/vector/vector.hpp>
+#include <boost/fusion/adapted/mpl.hpp>
 #include <boost/fusion/sequence/io/out.hpp>
 #include <boost/fusion/sequence/comparison/equal_to.hpp>
-#include <boost/fusion/sequence/generation/make_vector.hpp>
+#include <boost/fusion/container/generation/make_vector.hpp>
 #include <boost/fusion/algorithm/transformation/push_front.hpp>
 #include <boost/mpl/vector_c.hpp>
 #include <string>

test/algorithm/remove.cpp

@@ -5,10 +5,10 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/fusion/sequence/container/vector/vector.hpp>
-#include <boost/fusion/sequence/adapted/mpl.hpp>
+#include <boost/fusion/container/vector/vector.hpp>
+#include <boost/fusion/adapted/mpl.hpp>
 #include <boost/fusion/sequence/io/out.hpp>
-#include <boost/fusion/sequence/generation/make_vector.hpp>
+#include <boost/fusion/container/generation/make_vector.hpp>
 #include <boost/fusion/sequence/comparison/equal_to.hpp>
 #include <boost/fusion/algorithm/transformation/remove.hpp>
 #include <boost/mpl/vector.hpp>

test/algorithm/remove_if.cpp

@@ -5,10 +5,10 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/fusion/sequence/container/vector/vector.hpp>
-#include <boost/fusion/sequence/adapted/mpl.hpp>
+#include <boost/fusion/container/vector/vector.hpp>
+#include <boost/fusion/adapted/mpl.hpp>
 #include <boost/fusion/sequence/io/out.hpp>
-#include <boost/fusion/sequence/generation/make_vector.hpp>
+#include <boost/fusion/container/generation/make_vector.hpp>
 #include <boost/fusion/sequence/comparison/equal_to.hpp>
 #include <boost/fusion/algorithm/transformation/remove_if.hpp>
 #include <boost/type_traits/is_class.hpp>

test/algorithm/replace.cpp

@@ -5,12 +5,12 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/fusion/sequence/container/vector/vector.hpp>
-#include <boost/fusion/sequence/adapted/mpl.hpp>
+#include <boost/fusion/container/vector/vector.hpp>
+#include <boost/fusion/adapted/mpl.hpp>
 #include <boost/fusion/sequence/io/out.hpp>
 #include <boost/fusion/sequence/comparison/equal_to.hpp>
 #include <boost/fusion/sequence/intrinsic/at.hpp>
-#include <boost/fusion/sequence/generation/make_vector.hpp>
+#include <boost/fusion/container/generation/make_vector.hpp>
 #include <boost/fusion/algorithm/transformation/replace.hpp>
 #include <string>
 

test/algorithm/replace_if.cpp

@@ -5,13 +5,13 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/fusion/sequence/container/vector/vector.hpp>
-#include <boost/fusion/sequence/adapted/mpl.hpp>
-#include <boost/fusion/sequence/adapted/mpl.hpp>
+#include <boost/fusion/container/vector/vector.hpp>
+#include <boost/fusion/adapted/mpl.hpp>
+#include <boost/fusion/adapted/mpl.hpp>
 #include <boost/fusion/sequence/io/out.hpp>
 #include <boost/fusion/sequence/comparison/equal_to.hpp>
 #include <boost/fusion/sequence/intrinsic/at.hpp>
-#include <boost/fusion/sequence/generation/make_vector.hpp>
+#include <boost/fusion/container/generation/make_vector.hpp>
 #include <boost/fusion/algorithm/transformation/replace_if.hpp>
 #include <string>
 

test/algorithm/reverse.cpp

@@ -5,10 +5,10 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/fusion/sequence/container/vector/vector.hpp>
-#include <boost/fusion/sequence/adapted/mpl.hpp>
+#include <boost/fusion/container/vector/vector.hpp>
+#include <boost/fusion/adapted/mpl.hpp>
 #include <boost/fusion/sequence/io/out.hpp>
-#include <boost/fusion/sequence/generation/make_vector.hpp>
+#include <boost/fusion/container/generation/make_vector.hpp>
 #include <boost/fusion/sequence/comparison/equal_to.hpp>
 #include <boost/fusion/algorithm/transformation/reverse.hpp>
 #include <boost/mpl/range_c.hpp>

test/algorithm/transform.cpp

@@ -6,10 +6,10 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/fusion/sequence/container/vector/vector.hpp>
-#include <boost/fusion/sequence/adapted/mpl.hpp>
+#include <boost/fusion/container/vector/vector.hpp>
+#include <boost/fusion/adapted/mpl.hpp>
 #include <boost/fusion/sequence/io/out.hpp>
-#include <boost/fusion/sequence/generation/make_vector.hpp>
+#include <boost/fusion/container/generation/make_vector.hpp>
 #include <boost/fusion/sequence/comparison/equal_to.hpp>
 #include <boost/fusion/algorithm/transformation/transform.hpp>
 #include <boost/type_traits/is_class.hpp>

test/algorithm/zip.cpp

@@ -7,9 +7,9 @@
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
 #include <boost/fusion/algorithm/transformation/zip.hpp>
-#include <boost/fusion/sequence/generation/make_vector.hpp>
+#include <boost/fusion/container/generation/make_vector.hpp>
 #include <boost/fusion/sequence/comparison/equal_to.hpp>
-#include <boost/fusion/sequence/adapted/mpl.hpp>
+#include <boost/fusion/adapted/mpl.hpp>
 #include <boost/mpl/vector.hpp>
 
 int main()

test/algorithm/zip2.cpp

@@ -8,7 +8,7 @@
 #include <boost/detail/lightweight_test.hpp>
 #include <boost/fusion/algorithm/transformation/zip.hpp>
 #include <boost/fusion/sequence/comparison/equal_to.hpp>
-#include <boost/fusion/sequence/adapted/mpl.hpp>
+#include <boost/fusion/adapted/mpl.hpp>
 #include <boost/mpl/vector.hpp>
 
 int main()

test/algorithm/zip_ignore.cpp

@@ -6,7 +6,7 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/fusion/sequence/container/vector.hpp>
+#include <boost/fusion/container/vector.hpp>
 #include <boost/fusion/algorithm/transformation/zip.hpp>
 #include <boost/fusion/support/unused.hpp>
 #include <boost/fusion/iterator.hpp>

test/functional/fused.cpp

@@ -12,8 +12,8 @@
 #include <boost/noncopyable.hpp>
 #include <boost/blank.hpp>
 
-#include <boost/fusion/sequence/generation/make_vector.hpp>
-#include <boost/fusion/sequence/container/vector.hpp>
+#include <boost/fusion/container/generation/make_vector.hpp>
+#include <boost/fusion/container/vector.hpp>
 
 #include <boost/type_traits/is_same.hpp>
 #include <boost/mpl/assert.hpp>

test/functional/fused_function_object.cpp

@@ -12,8 +12,8 @@
 #include <boost/noncopyable.hpp>
 #include <boost/blank.hpp>
 
-#include <boost/fusion/sequence/generation/make_vector.hpp>
-#include <boost/fusion/sequence/container/vector.hpp>
+#include <boost/fusion/container/generation/make_vector.hpp>
+#include <boost/fusion/container/vector.hpp>
 
 namespace fusion = boost::fusion;
 using boost::noncopyable;

test/functional/fused_procedure.cpp

@@ -12,8 +12,8 @@
 #include <boost/noncopyable.hpp>
 #include <boost/blank.hpp>
 
-#include <boost/fusion/sequence/generation/make_vector.hpp>
-#include <boost/fusion/sequence/container/vector.hpp>
+#include <boost/fusion/container/generation/make_vector.hpp>
+#include <boost/fusion/container/vector.hpp>
 
 namespace fusion = boost::fusion;
 using boost::noncopyable;

test/functional/invoke.cpp

@@ -1,8 +1,8 @@
 /*=============================================================================
-    Copyright (c) 2005-2006 João Abecasis
+    Copyright (c) 2005-2006 Joao Abecasis
     Copyright (c) 2006-2007 Tobias Schwinger
-  
-    Use modification and distribution are subject to the Boost Software 
+
+    Use modification and distribution are subject to 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).
 ==============================================================================*/
@@ -17,12 +17,12 @@
 
 #include <boost/mpl/int.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/fusion/sequence/intrinsic/size.hpp>
 #include <boost/fusion/sequence/intrinsic/begin.hpp>
-#include <boost/fusion/sequence/view/single_view.hpp>
-#include <boost/fusion/sequence/view/iterator_range.hpp>
+#include <boost/fusion/view/single_view.hpp>
+#include <boost/fusion/view/iterator_range.hpp>
 #include <boost/fusion/iterator/advance.hpp>
 #include <boost/fusion/algorithm/transformation/join.hpp>
 
@@ -127,10 +127,10 @@ class members
 {
   public:
     int data;
- 
+
     members()
         : data(20)
-    { } 
+    { }
 
     int nullary() { return data + 1; }
     int nullary_c() const { return data + 2; }
@@ -340,17 +340,17 @@ void result_type_tests()
     using boost::is_same;
 
     BOOST_TEST(( is_same<
-      fusion::result_of::invoke<int (*)(), fusion::vector0 >::type, int 
+      fusion::result_of::invoke<int (*)(), fusion::vector0 >::type, int
     >::value ));
 // disabled until boost::result_of supports it
 //    BOOST_TEST(( is_same<
-//      fusion::result_of::invoke<int (*)(...), fusion::vector1<int> >::type, int 
+//      fusion::result_of::invoke<int (*)(...), fusion::vector1<int> >::type, int
 //    >::value ));
-    BOOST_TEST(( is_same< 
-      fusion::result_of::invoke<int (members::*)(), fusion::vector1<members*> >::type, int 
+    BOOST_TEST(( is_same<
+      fusion::result_of::invoke<int (members::*)(), fusion::vector1<members*> >::type, int
     >::value ));
 // disabled until boost::result_of supports it
-//    BOOST_TEST(( is_same< 
+//    BOOST_TEST(( is_same<
 //      fusion::result_of::invoke<int (members::*)(...), fusion::vector2<members*,int> >::type, int
 //    >::value ));
 }

test/functional/invoke_function_object.cpp

@@ -1,8 +1,8 @@
 /*=============================================================================
-    Copyright (c) 2005-2006 João Abecasis
+    Copyright (c) 2005-2006 Joao Abecasis
     Copyright (c) 2006-2007 Tobias Schwinger
-  
-    Use modification and distribution are subject to the Boost Software 
+
+    Use modification and distribution are subject to 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).
 ==============================================================================*/
@@ -17,12 +17,12 @@
 
 #include <boost/mpl/int.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/fusion/sequence/intrinsic/size.hpp>
 #include <boost/fusion/sequence/intrinsic/begin.hpp>
-#include <boost/fusion/sequence/view/single_view.hpp>
-#include <boost/fusion/sequence/view/iterator_range.hpp>
+#include <boost/fusion/view/single_view.hpp>
+#include <boost/fusion/view/iterator_range.hpp>
 #include <boost/fusion/iterator/advance.hpp>
 #include <boost/fusion/algorithm/transformation/join.hpp>
 
@@ -41,7 +41,7 @@ struct object_nc : boost::noncopyable {};
 struct fobj
 {
     // Handle nullary separately to exercise result_of support
-    template <typename Sig> 
+    template <typename Sig>
     struct result;
 
     template <class Self, typename T0>
@@ -97,7 +97,7 @@ struct fobj_nc
     {
         typedef int type;
     };
-    
+
     int operator()(int i)       { return 14 + i; }
     int operator()(int i) const { return 15 + i; }
 };

test/functional/invoke_procedure.cpp

@@ -1,8 +1,8 @@
 /*=============================================================================
-    Copyright (c) 2005-2006 João Abecasis
+    Copyright (c) 2005-2006 Joao Abecasis
     Copyright (c) 2006-2007 Tobias Schwinger
-  
-    Use modification and distribution are subject to the Boost Software 
+
+    Use modification and distribution are subject to 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).
 ==============================================================================*/
@@ -15,12 +15,12 @@
 
 #include <boost/mpl/int.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/fusion/sequence/intrinsic/size.hpp>
 #include <boost/fusion/sequence/intrinsic/begin.hpp>
-#include <boost/fusion/sequence/view/single_view.hpp>
-#include <boost/fusion/sequence/view/iterator_range.hpp>
+#include <boost/fusion/view/single_view.hpp>
+#include <boost/fusion/view/iterator_range.hpp>
 #include <boost/fusion/iterator/advance.hpp>
 #include <boost/fusion/algorithm/transformation/join.hpp>
 
@@ -48,10 +48,10 @@ class members
 {
   public:
     int data;
- 
+
     members()
         : data(20)
-    { } 
+    { }
 
     int nullary() { return element1 = data + 1; }
     int nullary_c() const { return element1 = data + 2; }

test/functional/make_fused.cpp

@@ -12,8 +12,8 @@
 #include <boost/noncopyable.hpp>
 #include <boost/blank.hpp>
 
-#include <boost/fusion/sequence/generation/make_vector.hpp>
-#include <boost/fusion/sequence/container/vector.hpp>
+#include <boost/fusion/container/generation/make_vector.hpp>
+#include <boost/fusion/container/vector.hpp>
 
 namespace fusion = boost::fusion;
 using boost::noncopyable;

test/functional/make_fused_function_object.cpp

@@ -12,8 +12,8 @@
 #include <boost/noncopyable.hpp>
 #include <boost/blank.hpp>
 
-#include <boost/fusion/sequence/generation/make_vector.hpp>
-#include <boost/fusion/sequence/container/vector.hpp>
+#include <boost/fusion/container/generation/make_vector.hpp>
+#include <boost/fusion/container/vector.hpp>
 
 namespace fusion = boost::fusion;
 using boost::noncopyable;

test/functional/make_fused_procedure.cpp

@@ -12,8 +12,8 @@
 #include <boost/noncopyable.hpp>
 #include <boost/blank.hpp>
 
-#include <boost/fusion/sequence/generation/make_vector.hpp>
-#include <boost/fusion/sequence/container/vector.hpp>
+#include <boost/fusion/container/generation/make_vector.hpp>
+#include <boost/fusion/container/vector.hpp>
 
 namespace fusion = boost::fusion;
 using boost::noncopyable;

test/sequence/adapt_assoc_struct.cpp

@@ -6,7 +6,7 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/fusion/sequence/adapted/struct/adapt_assoc_struct.hpp>
+#include <boost/fusion/adapted/struct/adapt_assoc_struct.hpp>
 #include <boost/fusion/sequence/intrinsic/at.hpp>
 #include <boost/fusion/sequence/intrinsic/size.hpp>
 #include <boost/fusion/sequence/intrinsic/empty.hpp>
@@ -16,10 +16,10 @@
 #include <boost/fusion/sequence/intrinsic/at_key.hpp>
 #include <boost/fusion/sequence/intrinsic/value_at_key.hpp>
 #include <boost/fusion/sequence/io/out.hpp>
-#include <boost/fusion/sequence/container/vector/vector.hpp>
-#include <boost/fusion/sequence/container/list/list.hpp>
-#include <boost/fusion/sequence/generation/make_vector.hpp>
-#include <boost/fusion/sequence/conversion/as_vector.hpp>
+#include <boost/fusion/container/vector/vector.hpp>
+#include <boost/fusion/container/list/list.hpp>
+#include <boost/fusion/container/generation/make_vector.hpp>
+#include <boost/fusion/container/vector/convert.hpp>
 #include <boost/fusion/sequence/comparison/equal_to.hpp>
 #include <boost/fusion/sequence/comparison/not_equal_to.hpp>
 #include <boost/fusion/sequence/comparison/less.hpp>

test/sequence/adapt_struct.cpp

@@ -5,17 +5,17 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/fusion/sequence/adapted/struct/adapt_struct.hpp>
+#include <boost/fusion/adapted/struct/adapt_struct.hpp>
 #include <boost/fusion/sequence/intrinsic/at.hpp>
 #include <boost/fusion/sequence/intrinsic/size.hpp>
 #include <boost/fusion/sequence/intrinsic/empty.hpp>
 #include <boost/fusion/sequence/intrinsic/front.hpp>
 #include <boost/fusion/sequence/intrinsic/back.hpp>
 #include <boost/fusion/sequence/io/out.hpp>
-#include <boost/fusion/sequence/container/vector/vector.hpp>
-#include <boost/fusion/sequence/container/list/list.hpp>
-#include <boost/fusion/sequence/generation/make_vector.hpp>
-#include <boost/fusion/sequence/conversion/as_vector.hpp>
+#include <boost/fusion/container/vector/vector.hpp>
+#include <boost/fusion/container/list/list.hpp>
+#include <boost/fusion/container/generation/make_vector.hpp>
+#include <boost/fusion/container/vector/convert.hpp>
 #include <boost/fusion/sequence/comparison/equal_to.hpp>
 #include <boost/fusion/sequence/comparison/not_equal_to.hpp>
 #include <boost/fusion/sequence/comparison/less.hpp>
@@ -42,6 +42,9 @@ BOOST_FUSION_ADAPT_STRUCT(
     (int, y)
 )
 
+struct s { int m; };
+BOOST_FUSION_ADAPT_STRUCT(s, (int, m))
+
 int
 main()
 {
@@ -101,6 +104,16 @@ main()
         l = p;
     }
 
+    { // begin/end
+        using namespace boost::fusion;
+        using boost::is_same;
+
+        typedef result_of::begin<s>::type b;
+        typedef result_of::end<s>::type e;
+        // this fails
+        BOOST_MPL_ASSERT((is_same<result_of::next<b>::type, e>));
+    }
+
     return boost::report_errors();
 }
 

test/sequence/array.cpp

@@ -8,7 +8,7 @@
 
 #include <boost/detail/lightweight_test.hpp>
 
-#include <boost/fusion/sequence/adapted/array.hpp>
+#include <boost/fusion/adapted/array.hpp>
 #include <boost/array.hpp>
 
 #include <boost/fusion/sequence/intrinsic.hpp>

test/sequence/as_list.cpp

@@ -5,11 +5,11 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/fusion/sequence/container/vector/vector.hpp>
-#include <boost/fusion/sequence/adapted/mpl.hpp>
-#include <boost/fusion/sequence/generation/make_vector.hpp>
-#include <boost/fusion/sequence/generation/make_list.hpp>
-#include <boost/fusion/sequence/conversion/as_list.hpp>
+#include <boost/fusion/container/vector/vector.hpp>
+#include <boost/fusion/adapted/mpl.hpp>
+#include <boost/fusion/container/generation/make_vector.hpp>
+#include <boost/fusion/container/generation/make_list.hpp>
+#include <boost/fusion/container/list/convert.hpp>
 #include <boost/fusion/algorithm/transformation/push_back.hpp>
 #include <boost/fusion/sequence/comparison/equal_to.hpp>
 #include <boost/fusion/sequence/io/out.hpp>

test/sequence/as_map.cpp

@@ -5,12 +5,12 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/fusion/sequence/container/vector/vector.hpp>
-#include <boost/fusion/sequence/adapted/mpl.hpp>
-#include <boost/fusion/sequence/generation/make_vector.hpp>
-#include <boost/fusion/sequence/generation/make_list.hpp>
-#include <boost/fusion/sequence/conversion/as_map.hpp>
-#include <boost/fusion/sequence/conversion/as_vector.hpp>
+#include <boost/fusion/container/vector/vector.hpp>
+#include <boost/fusion/adapted/mpl.hpp>
+#include <boost/fusion/container/generation/make_vector.hpp>
+#include <boost/fusion/container/generation/make_list.hpp>
+#include <boost/fusion/container/map/convert.hpp>
+#include <boost/fusion/container/vector/convert.hpp>
 #include <boost/fusion/algorithm/transformation/push_back.hpp>
 #include <boost/fusion/sequence/comparison/equal_to.hpp>
 #include <boost/fusion/sequence/intrinsic/at_key.hpp>

test/sequence/as_set.cpp

@@ -5,13 +5,13 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/fusion/sequence/container/vector/vector.hpp>
-#include <boost/fusion/sequence/adapted/mpl.hpp>
-#include <boost/fusion/sequence/generation/make_vector.hpp>
-#include <boost/fusion/sequence/generation/make_list.hpp>
-#include <boost/fusion/sequence/conversion/as_set.hpp>
-#include <boost/fusion/sequence/conversion/as_list.hpp>
-#include <boost/fusion/sequence/conversion/as_vector.hpp>
+#include <boost/fusion/container/vector/vector.hpp>
+#include <boost/fusion/adapted/mpl.hpp>
+#include <boost/fusion/container/generation/make_vector.hpp>
+#include <boost/fusion/container/generation/make_list.hpp>
+#include <boost/fusion/container/set/convert.hpp>
+#include <boost/fusion/container/list/convert.hpp>
+#include <boost/fusion/container/vector/convert.hpp>
 #include <boost/fusion/algorithm/transformation/push_back.hpp>
 #include <boost/fusion/sequence/comparison/equal_to.hpp>
 #include <boost/fusion/sequence/intrinsic/at_key.hpp>

test/sequence/as_vector.cpp

@@ -5,11 +5,11 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/fusion/sequence/container/vector/vector.hpp>
-#include <boost/fusion/sequence/adapted/mpl.hpp>
-#include <boost/fusion/sequence/generation/make_vector.hpp>
-#include <boost/fusion/sequence/generation/make_list.hpp>
-#include <boost/fusion/sequence/conversion/as_vector.hpp>
+#include <boost/fusion/container/vector/vector.hpp>
+#include <boost/fusion/adapted/mpl.hpp>
+#include <boost/fusion/container/generation/make_vector.hpp>
+#include <boost/fusion/container/generation/make_list.hpp>
+#include <boost/fusion/container/vector/convert.hpp>
 #include <boost/fusion/algorithm/transformation/push_back.hpp>
 #include <boost/fusion/sequence/comparison/equal_to.hpp>
 #include <boost/fusion/sequence/io/out.hpp>

test/sequence/back_extended_deque.cpp

@@ -1,17 +1,18 @@
 /*=============================================================================
-    Copyright (c) 1999-2003 Jaakko Järvi
+    Copyright (c) 1999-2003 Jaakko Jarvi
     Copyright (c) 2001-2006 Joel de Guzman
     Copyright (c) 2006 Dan Marsden
 
-    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)
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
 
-#include <boost/fusion/sequence/container/deque/deque.hpp>
-#include <boost/fusion/sequence/container/deque/back_extended_deque.hpp>
+#include <boost/fusion/container/deque/deque.hpp>
+#include <boost/fusion/container/deque/back_extended_deque.hpp>
 #include <boost/fusion/sequence/comparison.hpp>
-#include <boost/fusion/sequence/generation/make_vector.hpp>
+#include <boost/fusion/container/generation/make_vector.hpp>
+#include <boost/fusion/mpl.hpp>
 
 #include <boost/fusion/sequence/intrinsic.hpp>
 #include <boost/fusion/iterator.hpp>

test/sequence/boost_tuple.cpp

@@ -5,17 +5,17 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/fusion/sequence/adapted/boost_tuple.hpp>
+#include <boost/fusion/adapted/boost_tuple.hpp>
 #include <boost/fusion/sequence/intrinsic/at.hpp>
 #include <boost/fusion/sequence/intrinsic/size.hpp>
 #include <boost/fusion/sequence/intrinsic/empty.hpp>
 #include <boost/fusion/sequence/intrinsic/front.hpp>
 #include <boost/fusion/sequence/intrinsic/back.hpp>
 #include <boost/fusion/sequence/io/out.hpp>
-#include <boost/fusion/sequence/container/vector/vector.hpp>
-#include <boost/fusion/sequence/container/list/list.hpp>
-#include <boost/fusion/sequence/generation/make_vector.hpp>
-#include <boost/fusion/sequence/conversion/as_vector.hpp>
+#include <boost/fusion/container/vector/vector.hpp>
+#include <boost/fusion/container/list/list.hpp>
+#include <boost/fusion/container/generation/make_vector.hpp>
+#include <boost/fusion/container/vector/convert.hpp>
 #include <boost/fusion/sequence/comparison/equal_to.hpp>
 #include <boost/fusion/sequence/comparison/not_equal_to.hpp>
 #include <boost/fusion/sequence/comparison/less.hpp>

test/sequence/comparison.hpp

@@ -1,5 +1,5 @@
 /*=============================================================================
-    Copyright (c) 1999-2003 Jaakko Järvi
+    Copyright (c) 1999-2003 Jaakko Jarvi
     Copyright (c) 2001-2006 Joel de Guzman
 
     Distributed under the Boost Software License, Version 1.0. (See accompanying 

test/sequence/cons.cpp

@@ -7,11 +7,11 @@
 ==============================================================================*/
 #include <string>
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/fusion/sequence/container/list/cons.hpp>
-#include <boost/fusion/sequence/generation/make_cons.hpp>
-#include <boost/fusion/sequence/generation/cons_tie.hpp>
-#include <boost/fusion/sequence/container/vector/vector.hpp>
-#include <boost/fusion/sequence/generation/make_vector.hpp>
+#include <boost/fusion/container/list/cons.hpp>
+#include <boost/fusion/container/generation/make_cons.hpp>
+#include <boost/fusion/container/generation/cons_tie.hpp>
+#include <boost/fusion/container/vector/vector.hpp>
+#include <boost/fusion/container/generation/make_vector.hpp>
 #include <boost/fusion/sequence/comparison/equal_to.hpp>
 #include <boost/lambda/lambda.hpp>
 #include <boost/fusion/algorithm/iteration/for_each.hpp>

test/sequence/construction.hpp

@@ -1,13 +1,13 @@
 /*=============================================================================
-    Copyright (c) 1999-2003 Jaakko Järvi
+    Copyright (c) 1999-2003 Jaakko Jarvi
     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)
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
 #include <boost/fusion/sequence/intrinsic/at.hpp>
-#include <boost/fusion/sequence/container/list/cons.hpp>
+#include <boost/fusion/container/list/cons.hpp>
 
 #if !defined(FUSION_AT)
 #define FUSION_AT at_c
@@ -57,7 +57,9 @@ test()
 
     FUSION_SEQUENCE<> empty0;
 
+#ifndef TR1_TUPLE_TEST
     FUSION_SEQUENCE<> empty1(empty);
+#endif
 
     FUSION_SEQUENCE<int> t1;
     BOOST_TEST(FUSION_AT<0>(t1) == int());

test/sequence/copy.hpp

@@ -1,5 +1,5 @@
 /*=============================================================================
-    Copyright (c) 1999-2003 Jaakko Järvi
+    Copyright (c) 1999-2003 Jaakko Jarvi
     Copyright (c) 2001-2006 Joel de Guzman
 
     Distributed under the Boost Software License, Version 1.0. (See accompanying 
@@ -7,7 +7,7 @@
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
 #include <boost/fusion/sequence/intrinsic/at.hpp>
-#include <boost/fusion/sequence/intrinsic/mpl.hpp>
+#include <boost/fusion/mpl.hpp>
 #include <boost/preprocessor/cat.hpp>
 #include <boost/mpl/insert_range.hpp>
 #include <boost/mpl/vector.hpp>

test/sequence/deduce_sequence.cpp

@@ -7,7 +7,7 @@
 ==============================================================================*/
 
 #include <boost/fusion/support/deduce_sequence.hpp>
-#include <boost/fusion/sequence/intrinsic/mpl.hpp>
+#include <boost/fusion/mpl.hpp>
 #include <boost/detail/lightweight_test.hpp>
 
 #include <boost/mpl/equal.hpp>
@@ -35,7 +35,7 @@ struct test_seq_ctor
 #define TEST_SAME_ELEMENTS(a,b) BOOST_TEST(( boost::mpl::equal< a, b >::type::value ))
 
 typedef fusion::vector<int, int const, int &, int const &> args1;
-typedef fusion::vector<int, int const, int &, int> storable1;
+typedef fusion::vector<int, int, int &, int> storable1;
 template struct test_seq_ctor<args1>;
 
 typedef fusion::vector< reference_wrapper<int> &, reference_wrapper<int const> &,
@@ -45,7 +45,7 @@ template struct test_seq_ctor<args2>;
 
 
 typedef fusion::vector<int *, int const *, int const * const, int const * &, int const * const &> args3;
-typedef fusion::vector<int *, int const *, int const * const, int const * &, int const * > storable3;
+typedef fusion::vector<int *, int const *, int const *, int const * &, int const * > storable3;
 template struct test_seq_ctor<args3>;
 
 typedef fusion::vector<int(&)[2], int const(&)[2]> args4;

test/sequence/deque_comparison.cpp

@@ -1,12 +1,12 @@
 /*=============================================================================
-    Copyright (c) 1999-2003 Jaakko Järvi
+    Copyright (c) 1999-2003 Jaakko Jarvi
     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)
 ==============================================================================*/
-#include <boost/fusion/sequence/container/deque/deque.hpp>
+#include <boost/fusion/container/deque/deque.hpp>
 
 #define FUSION_SEQUENCE deque
 #include "comparison.hpp"

test/sequence/deque_construction.cpp

@@ -1,12 +1,12 @@
 /*=============================================================================
-    Copyright (c) 1999-2003 Jaakko Järvi
+    Copyright (c) 1999-2003 Jaakko Jarvi
     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)
 ==============================================================================*/
-#include <boost/fusion/sequence/container/deque/deque.hpp>
+#include <boost/fusion/container/deque/deque.hpp>
 
 #define FUSION_SEQUENCE deque
 #include "construction.hpp"

test/sequence/deque_copy.cpp

@@ -1,14 +1,14 @@
 /*=============================================================================
-    Copyright (c) 1999-2003 Jaakko Järvi
+    Copyright (c) 1999-2003 Jaakko Jarvi
     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)
 ==============================================================================*/
-#include <boost/fusion/sequence/container/deque/deque.hpp>
-#include <boost/fusion/sequence/generation/make_deque.hpp>
-#include <boost/fusion/sequence/generation/deque_tie.hpp>
+#include <boost/fusion/container/deque/deque.hpp>
+#include <boost/fusion/container/generation/make_deque.hpp>
+#include <boost/fusion/container/generation/deque_tie.hpp>
 
 #define FUSION_SEQUENCE deque
 #include "copy.hpp"

test/sequence/deque_iterator.cpp

@@ -5,7 +5,7 @@
     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)
 ==============================================================================*/
-#include <boost/fusion/sequence/container/deque/deque.hpp>
+#include <boost/fusion/container/deque/deque.hpp>
 
 #define FUSION_SEQUENCE deque
 #define FUSION_TRAVERSAL_TAG bidirectional_traversal_tag

test/sequence/deque_make.cpp

@@ -1,13 +1,13 @@
 /*=============================================================================
-    Copyright (c) 1999-2003 Jaakko Järvi
+    Copyright (c) 1999-2003 Jaakko Jarvi
     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)
 ==============================================================================*/
-#include <boost/fusion/sequence/container/deque/deque.hpp>
-#include <boost/fusion/sequence/generation/make_deque.hpp>
+#include <boost/fusion/container/deque/deque.hpp>
+#include <boost/fusion/container/generation/make_deque.hpp>
 
 #define FUSION_SEQUENCE deque
 #include "make.hpp"

test/sequence/deque_misc.cpp

@@ -1,14 +1,14 @@
 /*=============================================================================
-    Copyright (c) 1999-2003 Jaakko Järvi
+    Copyright (c) 1999-2003 Jaakko Jarvi
     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)
 ==============================================================================*/
-#include <boost/fusion/sequence/container/deque/deque.hpp>
-#include <boost/fusion/sequence/conversion/as_deque.hpp>
-#include <boost/fusion/sequence/adapted/mpl.hpp>
+#include <boost/fusion/container/deque/deque.hpp>
+#include <boost/fusion/container/deque/convert.hpp>
+#include <boost/fusion/adapted/mpl.hpp>
 
 #define FUSION_SEQUENCE deque
 #include "misc.hpp"

test/sequence/deque_mutate.cpp

@@ -1,12 +1,12 @@
 /*=============================================================================
-    Copyright (c) 1999-2003 Jaakko Järvi
+    Copyright (c) 1999-2003 Jaakko Jarvi
     Copyright (c) 2001-2006 Joel de Guzman
     Copyright (c) 2006
 
     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)
 ==============================================================================*/
-#include <boost/fusion/sequence/container/deque/deque.hpp>
+#include <boost/fusion/container/deque/deque.hpp>
 
 #define FUSION_SEQUENCE deque
 #include "mutate.hpp"

test/sequence/deque_tie.cpp

@@ -1,15 +1,15 @@
 /*=============================================================================
-    Copyright (c) 1999-2003 Jaakko Järvi
+    Copyright (c) 1999-2003 Jaakko Jarvi
     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)
 ==============================================================================*/
-#include <boost/fusion/sequence/container/deque/deque.hpp>
-#include <boost/fusion/sequence/generation/deque_tie.hpp>
-#include <boost/fusion/sequence/generation/ignore.hpp>
-#include <boost/fusion/sequence/generation/make_deque.hpp>
+#include <boost/fusion/container/deque/deque.hpp>
+#include <boost/fusion/container/generation/deque_tie.hpp>
+#include <boost/fusion/container/generation/ignore.hpp>
+#include <boost/fusion/container/generation/make_deque.hpp>
 
 #define FUSION_SEQUENCE deque
 #include "tie.hpp"

test/sequence/deque_value_at.cpp

@@ -1,12 +1,12 @@
 /*=============================================================================
-    Copyright (c) 1999-2003 Jaakko Järvi
+    Copyright (c) 1999-2003 Jaakko Jarvi
     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)
 ==============================================================================*/
-#include <boost/fusion/sequence/container/deque/deque.hpp>
+#include <boost/fusion/container/deque/deque.hpp>
 
 #define FUSION_SEQUENCE deque
 #include "value_at.hpp"

test/sequence/ext_/iterator_range_s.cpp

@@ -7,11 +7,11 @@
 #include <boost/detail/lightweight_test.hpp>
 #include <boost/fusion/algorithm/iteration/ext_/for_each_s.hpp>
 #include <boost/fusion/algorithm/query/ext_/find_if_s.hpp>
-#include <boost/fusion/sequence/container/vector/vector.hpp>
-#include <boost/fusion/sequence/container/ext_/tree.hpp>
-#include <boost/fusion/sequence/generation/make_vector.hpp>
-#include <boost/fusion/sequence/view/iterator_range/iterator_range.hpp>
-#include <boost/fusion/sequence/view/ext_/segmented_iterator_range.hpp>
+#include <boost/fusion/container/vector/vector.hpp>
+#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/sequence/comparison/equal_to.hpp>
 #include <boost/fusion/sequence/io/out.hpp>
 #include <boost/fusion/sequence/intrinsic/size.hpp>
@@ -43,8 +43,8 @@ process_tree(Tree const &tree)
     using namespace fusion;
     using mpl::_;
 
-    typedef typename result_of::find_if_s<Tree const, is_same<_,short> >::type short_iter;
-    typedef typename result_of::find_if_s<Tree const, is_same<_,float> >::type float_iter;
+    typedef typename fusion::result_of::find_if_s<Tree const, is_same<_,short> >::type short_iter;
+    typedef typename fusion::result_of::find_if_s<Tree const, is_same<_,float> >::type float_iter;
 
     typedef iterator_range<short_iter, float_iter> slice_t;
     BOOST_STATIC_ASSERT(traits::is_segmented<slice_t>::value);

test/sequence/filter_view.cpp

@@ -5,13 +5,13 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/fusion/sequence/container/vector/vector.hpp>
-#include <boost/fusion/sequence/adapted/mpl.hpp>
-#include <boost/fusion/sequence/container/vector/vector_iterator.hpp>
+#include <boost/fusion/container/vector/vector.hpp>
+#include <boost/fusion/adapted/mpl.hpp>
+#include <boost/fusion/container/vector/vector_iterator.hpp>
 #include <boost/fusion/sequence/io/out.hpp>
 #include <boost/fusion/sequence/comparison/equal_to.hpp>
-#include <boost/fusion/sequence/view/filter_view/filter_view.hpp>
-#include <boost/fusion/sequence/generation/make_vector.hpp>
+#include <boost/fusion/view/filter_view/filter_view.hpp>
+#include <boost/fusion/container/generation/make_vector.hpp>
 #include <boost/fusion/sequence/intrinsic/size.hpp>
 #include <boost/type_traits/is_class.hpp>
 #include <boost/type_traits/is_same.hpp>
@@ -95,6 +95,7 @@ main()
         // (e.g. comeau 4.3.3, intel) have problems with this.
         // vc7.1 and g++ are ok. The errors from comeau are useless.
         
+#ifndef __EDG_VERSION__
         typedef vector_c<int, 5, 1, 2, 3, 6, 0, -1> vector_type;
         typedef filter_view<vector_type const, less<_, int_<3> > > filter_view_type;
         vector_type v;
@@ -102,6 +103,7 @@ main()
         std::cout << view << std::endl;
         BOOST_TEST((view == make_vector(1, 2, 0, -1)));
         BOOST_STATIC_ASSERT(result_of::size<filter_view_type>::value == 4);
+#endif
     }
 
     {

test/sequence/front_extended_deque.cpp

@@ -1,17 +1,18 @@
 /*=============================================================================
-    Copyright (c) 1999-2003 Jaakko Järvi
+    Copyright (c) 1999-2003 Jaakko Jarvi
     Copyright (c) 2001-2006 Joel de Guzman
     Copyright (c) 2006 Dan Marsden
 
-    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)
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
 
-#include <boost/fusion/sequence/container/deque/deque.hpp>
-#include <boost/fusion/sequence/container/deque/front_extended_deque.hpp>
+#include <boost/fusion/container/deque/deque.hpp>
+#include <boost/fusion/container/deque/front_extended_deque.hpp>
 #include <boost/fusion/sequence/comparison.hpp>
-#include <boost/fusion/sequence/generation/make_vector.hpp>
+#include <boost/fusion/container/generation/make_vector.hpp>
+#include <boost/fusion/mpl.hpp>
 
 #include <boost/fusion/sequence/intrinsic.hpp>
 #include <boost/fusion/iterator.hpp>

test/sequence/io.cpp

@@ -1,12 +1,12 @@
 /*=============================================================================
-    Copyright (C) 1999-2003 Jaakko Järvi
+    Copyright (C) 1999-2003 Jaakko Jarvi
 
     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)
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/fusion/sequence/container/vector/vector.hpp>
-#include <boost/fusion/sequence/generation/make_vector.hpp>
+#include <boost/fusion/container/vector/vector.hpp>
+#include <boost/fusion/container/generation/make_vector.hpp>
 #include <boost/fusion/sequence/comparison/equal_to.hpp>
 #include <boost/fusion/sequence/io/out.hpp>
 #include <boost/fusion/sequence/io/in.hpp>

test/sequence/iterator_range.cpp

@@ -5,9 +5,9 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/fusion/sequence/container/vector/vector.hpp>
-#include <boost/fusion/sequence/generation/make_vector.hpp>
-#include <boost/fusion/sequence/view/iterator_range/iterator_range.hpp>
+#include <boost/fusion/container/vector/vector.hpp>
+#include <boost/fusion/container/generation/make_vector.hpp>
+#include <boost/fusion/view/iterator_range/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>

test/sequence/joint_view.cpp

@@ -5,11 +5,11 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/fusion/sequence/container/vector/vector.hpp>
-#include <boost/fusion/sequence/view/joint_view/joint_view.hpp>
+#include <boost/fusion/container/vector/vector.hpp>
+#include <boost/fusion/view/joint_view/joint_view.hpp>
 #include <boost/fusion/sequence/io/out.hpp>
 #include <boost/fusion/sequence/comparison/equal_to.hpp>
-#include <boost/fusion/sequence/generation/make_vector.hpp>
+#include <boost/fusion/container/generation/make_vector.hpp>
 #include <boost/fusion/sequence/intrinsic/at.hpp>
 #include <boost/mpl/vector_c.hpp>
 

test/sequence/list_comparison.cpp

@@ -1,11 +1,11 @@
 /*=============================================================================
-    Copyright (c) 1999-2003 Jaakko Järvi
+    Copyright (c) 1999-2003 Jaakko Jarvi
     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)
 ==============================================================================*/
-#include <boost/fusion/sequence/container/list/list.hpp>
+#include <boost/fusion/container/list/list.hpp>
 
 #define FUSION_SEQUENCE list
 #include "comparison.hpp"

test/sequence/list_construction.cpp

@@ -1,11 +1,11 @@
 /*=============================================================================
-    Copyright (c) 1999-2003 Jaakko Järvi
+    Copyright (c) 1999-2003 Jaakko Jarvi
     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)
 ==============================================================================*/
-#include <boost/fusion/sequence/container/list/list.hpp>
+#include <boost/fusion/container/list/list.hpp>
 
 #define FUSION_SEQUENCE list
 #include "construction.hpp"

test/sequence/list_copy.cpp

@@ -1,13 +1,13 @@
 /*=============================================================================
-    Copyright (c) 1999-2003 Jaakko Järvi
+    Copyright (c) 1999-2003 Jaakko Jarvi
     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)
 ==============================================================================*/
-#include <boost/fusion/sequence/container/list/list.hpp>
-#include <boost/fusion/sequence/generation/make_list.hpp>
-#include <boost/fusion/sequence/generation/list_tie.hpp>
+#include <boost/fusion/container/list/list.hpp>
+#include <boost/fusion/container/generation/make_list.hpp>
+#include <boost/fusion/container/generation/list_tie.hpp>
 
 #define FUSION_SEQUENCE list
 #include "copy.hpp"

test/sequence/list_iterator.cpp

@@ -4,7 +4,7 @@
     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)
 ==============================================================================*/
-#include <boost/fusion/sequence/container/list/list.hpp>
+#include <boost/fusion/container/list/list.hpp>
 
 #define FUSION_SEQUENCE list
 #define FUSION_NO_PRIOR

test/sequence/list_make.cpp

@@ -1,12 +1,12 @@
 /*=============================================================================
-    Copyright (c) 1999-2003 Jaakko Järvi
+    Copyright (c) 1999-2003 Jaakko Jarvi
     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)
 ==============================================================================*/
-#include <boost/fusion/sequence/container/list/list.hpp>
-#include <boost/fusion/sequence/generation/make_list.hpp>
+#include <boost/fusion/container/list/list.hpp>
+#include <boost/fusion/container/generation/make_list.hpp>
 
 #define FUSION_SEQUENCE list
 #include "make.hpp"

test/sequence/list_misc.cpp

@@ -1,13 +1,12 @@
 /*=============================================================================
-    Copyright (c) 1999-2003 Jaakko Järvi
+    Copyright (c) 1999-2003 Jaakko Jarvi
     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)
 ==============================================================================*/
-#include <boost/fusion/sequence/container/list/list.hpp>
-#include <boost/fusion/sequence/conversion/as_list.hpp>
-#include <boost/fusion/sequence/adapted/mpl.hpp>
+#include <boost/fusion/container/list/list.hpp>
+#include <boost/fusion/container/list/convert.hpp>
 
 #define FUSION_SEQUENCE list
 #define FUSION_FORWARD_ONLY

test/sequence/list_mutate.cpp

@@ -1,11 +1,11 @@
 /*=============================================================================
-    Copyright (c) 1999-2003 Jaakko Järvi
+    Copyright (c) 1999-2003 Jaakko Jarvi
     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)
 ==============================================================================*/
-#include <boost/fusion/sequence/container/list/list.hpp>
+#include <boost/fusion/container/list/list.hpp>
 
 #define FUSION_SEQUENCE list
 #include "mutate.hpp"

test/sequence/list_tie.cpp

@@ -1,14 +1,14 @@
 /*=============================================================================
-    Copyright (c) 1999-2003 Jaakko Järvi
+    Copyright (c) 1999-2003 Jaakko Jarvi
     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)
 ==============================================================================*/
-#include <boost/fusion/sequence/container/list/list.hpp>
-#include <boost/fusion/sequence/generation/list_tie.hpp>
-#include <boost/fusion/sequence/generation/ignore.hpp>
-#include <boost/fusion/sequence/generation/make_list.hpp>
+#include <boost/fusion/container/list/list.hpp>
+#include <boost/fusion/container/generation/list_tie.hpp>
+#include <boost/fusion/container/generation/ignore.hpp>
+#include <boost/fusion/container/generation/make_list.hpp>
 
 #define FUSION_SEQUENCE list
 #include "tie.hpp"

test/sequence/list_value_at.cpp

@@ -1,11 +1,11 @@
 /*=============================================================================
-    Copyright (c) 1999-2003 Jaakko Järvi
+    Copyright (c) 1999-2003 Jaakko Jarvi
     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)
 ==============================================================================*/
-#include <boost/fusion/sequence/container/list/list.hpp>
+#include <boost/fusion/container/list/list.hpp>
 
 #define FUSION_SEQUENCE list
 #include "value_at.hpp"

test/sequence/make.hpp

@@ -1,5 +1,5 @@
 /*=============================================================================
-    Copyright (c) 1999-2003 Jaakko Järvi
+    Copyright (c) 1999-2003 Jaakko Jarvi
     Copyright (c) 2001-2006 Joel de Guzman
 
     Distributed under the Boost Software License, Version 1.0. (See accompanying 

test/sequence/make_list.cpp

@@ -1,12 +1,12 @@
 /*=============================================================================
-    Copyright (c) 1999-2003 Jaakko Järvi
+    Copyright (c) 1999-2003 Jaakko Jarvi
     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)
 ==============================================================================*/
-#include <boost/fusion/sequence/container/list/list.hpp>
-#include <boost/fusion/sequence/generation/make_list.hpp>
+#include <boost/fusion/container/list/list.hpp>
+#include <boost/fusion/container/generation/make_list.hpp>
 
 #define FUSION_SEQUENCE list
 #include "make.hpp"

test/sequence/make_vector.cpp

@@ -1,12 +1,12 @@
 /*=============================================================================
-    Copyright (c) 1999-2003 Jaakko Järvi
+    Copyright (c) 1999-2003 Jaakko Jarvi
     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)
 ==============================================================================*/
-#include <boost/fusion/sequence/container/vector/vector.hpp>
-#include <boost/fusion/sequence/generation/make_vector.hpp>
+#include <boost/fusion/container/vector/vector.hpp>
+#include <boost/fusion/container/generation/make_vector.hpp>
 
 #define FUSION_SEQUENCE vector
 #include "make.hpp"

test/sequence/map.cpp

@@ -5,8 +5,8 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/fusion/sequence/container/map/map.hpp>
-#include <boost/fusion/sequence/generation/make_map.hpp>
+#include <boost/fusion/container/map/map.hpp>
+#include <boost/fusion/container/generation/make_map.hpp>
 #include <boost/fusion/sequence/intrinsic/at_key.hpp>
 #include <boost/fusion/sequence/intrinsic/value_at_key.hpp>
 #include <boost/fusion/sequence/intrinsic/has_key.hpp>

test/sequence/map_tie.cpp

@@ -7,7 +7,7 @@
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
 
-#include <boost/fusion/sequence/generation/map_tie.hpp>
+#include <boost/fusion/container/generation/map_tie.hpp>
 #include <boost/fusion/sequence/intrinsic/at_key.hpp>
 
 struct key_zero;

test/sequence/misc.hpp

@@ -1,13 +1,14 @@
 /*=============================================================================
-    Copyright (C) 1999-2003 Jaakko Järvi
+    Copyright (C) 1999-2003 Jaakko Jarvi
     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)
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
 #include <boost/fusion/sequence/intrinsic.hpp>
 #include <boost/fusion/support/is_sequence.hpp>
+#include <boost/fusion/mpl.hpp>
 #include <boost/mpl/find.hpp>
 #include <boost/mpl/equal.hpp>
 #include <boost/mpl/int.hpp>
@@ -105,7 +106,7 @@ struct test_intrinsics2
     BOOST_STATIC_ASSERT((boost::mpl::equal<seq2, target2>::value));
 
 #endif
-    
+
     typedef boost::fusion::FUSION_SEQUENCE<int> target3;
     typedef boost::mpl::push_front<seq0, int>::type seq3;
     BOOST_STATIC_ASSERT((boost::mpl::equal<seq3, target3>::value));
@@ -170,9 +171,9 @@ test()
         BOOST_STATIC_ASSERT(!traits::is_sequence<int>::value);
         BOOST_STATIC_ASSERT(!traits::is_sequence<char>::value);
     }
-    
+
     {   // testing mpl compatibility
-        
+
         // test begin, end, next, prior, advance, size, deref, etc.
         //~ typedef FUSION_SEQUENCE<int, float, bool, char> tuple_type;
         //~ test_intrinsics1<tuple_type> test1;
@@ -181,7 +182,7 @@ test()
         // test an algorithm
         typedef FUSION_SEQUENCE<int, float, double> t1;
         typedef boost::mpl::find<t1, float>::type iter;
-        typedef boost::mpl::deref<iter>::type type;        
+        typedef boost::mpl::deref<iter>::type type;
         BOOST_STATIC_ASSERT((boost::is_same<type, float>::value));
 
     }

test/sequence/mutate.hpp

@@ -1,5 +1,5 @@
 /*=============================================================================
-    Copyright (c) 1999-2003 Jaakko Järvi
+    Copyright (c) 1999-2003 Jaakko Jarvi
     Copyright (c) 2001-2006 Joel de Guzman
 
     Distributed under the Boost Software License, Version 1.0. (See accompanying 

test/sequence/repetitive_view.cpp

@@ -7,10 +7,10 @@
 ==============================================================================*/
 
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/fusion/sequence/view/repetitive_view.hpp>
+#include <boost/fusion/view/repetitive_view.hpp>
 
-#include <boost/fusion/sequence/container/vector.hpp>
-#include <boost/fusion/sequence/view/joint_view.hpp>
+#include <boost/fusion/container/vector.hpp>
+#include <boost/fusion/view/joint_view.hpp>
 #include <boost/fusion/algorithm/transformation/zip.hpp>
 #include <boost/fusion/algorithm/iteration/for_each.hpp>
 

test/sequence/reverse_view.cpp

@@ -5,12 +5,12 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/fusion/sequence/container/vector/vector.hpp>
-#include <boost/fusion/sequence/adapted/mpl.hpp>
+#include <boost/fusion/container/vector/vector.hpp>
+#include <boost/fusion/adapted/mpl.hpp>
 #include <boost/fusion/sequence/io/out.hpp>
-#include <boost/fusion/sequence/generation/make_vector.hpp>
+#include <boost/fusion/container/generation/make_vector.hpp>
 #include <boost/fusion/sequence/comparison/equal_to.hpp>
-#include <boost/fusion/sequence/view/reverse_view/reverse_view.hpp>
+#include <boost/fusion/view/reverse_view/reverse_view.hpp>
 #include <boost/fusion/sequence/intrinsic/begin.hpp>
 #include <boost/fusion/iterator/next.hpp>
 #include <boost/fusion/iterator/prior.hpp>

test/sequence/set.cpp

@@ -5,8 +5,8 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/fusion/sequence/container/set/set.hpp>
-#include <boost/fusion/sequence/generation/make_set.hpp>
+#include <boost/fusion/container/set/set.hpp>
+#include <boost/fusion/container/generation/make_set.hpp>
 #include <boost/fusion/sequence/intrinsic/at_key.hpp>
 #include <boost/fusion/sequence/intrinsic/value_at_key.hpp>
 #include <boost/fusion/sequence/intrinsic/has_key.hpp>

test/sequence/single_view.cpp

@@ -6,7 +6,7 @@
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
 #include <boost/fusion/sequence/io/out.hpp>
-#include <boost/fusion/sequence/view/single_view/single_view.hpp>
+#include <boost/fusion/view/single_view/single_view.hpp>
 #include <boost/fusion/sequence/intrinsic/begin.hpp>
 #include <boost/fusion/iterator/deref.hpp>
 

test/sequence/std_pair.cpp

@@ -5,17 +5,17 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/fusion/sequence/adapted/std_pair.hpp>
+#include <boost/fusion/adapted/std_pair.hpp>
 #include <boost/fusion/sequence/intrinsic/at.hpp>
 #include <boost/fusion/sequence/intrinsic/size.hpp>
 #include <boost/fusion/sequence/intrinsic/empty.hpp>
 #include <boost/fusion/sequence/intrinsic/front.hpp>
 #include <boost/fusion/sequence/intrinsic/back.hpp>
 #include <boost/fusion/sequence/io/out.hpp>
-#include <boost/fusion/sequence/container/vector/vector.hpp>
-#include <boost/fusion/sequence/container/list/list.hpp>
-#include <boost/fusion/sequence/generation/make_vector.hpp>
-#include <boost/fusion/sequence/conversion/as_vector.hpp>
+#include <boost/fusion/container/vector/vector.hpp>
+#include <boost/fusion/container/list/list.hpp>
+#include <boost/fusion/container/generation/make_vector.hpp>
+#include <boost/fusion/container/vector/convert.hpp>
 #include <boost/fusion/sequence/comparison/equal_to.hpp>
 #include <boost/fusion/sequence/comparison/not_equal_to.hpp>
 #include <boost/fusion/sequence/comparison/less.hpp>

test/sequence/swap.cpp

@@ -6,8 +6,8 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include <boost/fusion/sequence/intrinsic/swap.hpp>
-#include <boost/fusion/sequence/container/vector.hpp>
-#include <boost/fusion/sequence/generation/make_vector.hpp>
+#include <boost/fusion/container/vector.hpp>
+#include <boost/fusion/container/generation/make_vector.hpp>
 #include <boost/fusion/sequence/comparison/equal_to.hpp>
 #include <boost/detail/lightweight_test.hpp>
 

test/sequence/tie.hpp

@@ -1,5 +1,5 @@
 /*=============================================================================
-    Copyright (c) 1999-2003 Jaakko Järvi
+    Copyright (c) 1999-2003 Jaakko Jarvi
     Copyright (c) 2001-2006 Joel de Guzman
 
     Distributed under the Boost Software License, Version 1.0. (See accompanying 

test/sequence/tr1_tuple_auto_conv.cpp

@@ -0,0 +1,56 @@
+#include <boost/tr1/memory.hpp>
+#include <boost/tr1/tuple.hpp>
+#include <boost/any.hpp>
+#include <iostream>
+
+namespace Core
+{
+    class AutoConverter
+    {
+        std::tr1::shared_ptr<boost::any> t_;
+
+    public:
+        AutoConverter(std::tr1::shared_ptr<boost::any> const & t)
+            : t_(t)
+        {}
+
+        template <typename C>
+        operator C ()
+        {
+            try
+            {
+                boost::any & a = (*t_);
+
+                return boost::any_cast<C>(a);
+            }
+            catch(boost::bad_any_cast & e)
+            {
+                std::cerr << "Internal conversion bug: "
+                          << "Failed to convert data holder to "
+                          << typeid(C).name() << "\n"
+                          << e.what()
+                          << std::endl;
+
+                C c = C();
+                return c;
+            }
+        }
+    };
+
+
+    inline AutoConverter Demo()
+    {
+        std::tr1::shared_ptr<boost::any> p_result
+            (new boost::any(std::tr1::make_tuple(1, 2, 3, 4)));
+        return p_result;
+    }
+
+} // namespace Core
+
+
+int main(int argc, char* argv[])
+{
+    std::tr1::tuple<int, int, int, int> test = Core::Demo();
+    return 0;
+}
+

test/sequence/transform_view.cpp

@@ -5,12 +5,12 @@
     file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 ==============================================================================*/
 #include <boost/detail/lightweight_test.hpp>
-#include <boost/fusion/sequence/container/vector/vector.hpp>
-#include <boost/fusion/sequence/adapted/mpl.hpp>
+#include <boost/fusion/container/vector/vector.hpp>
+#include <boost/fusion/adapted/mpl.hpp>
 #include <boost/fusion/sequence/io/out.hpp>
-#include <boost/fusion/sequence/generation/make_vector.hpp>
+#include <boost/fusion/container/generation/make_vector.hpp>
 #include <boost/fusion/sequence/comparison/equal_to.hpp>
-#include <boost/fusion/sequence/view/transform_view/transform_view.hpp>
+#include <boost/fusion/view/transform_view/transform_view.hpp>
 #include <boost/fusion/sequence/intrinsic/begin.hpp>
 #include <boost/fusion/sequence/intrinsic/at.hpp>
 #include <boost/fusion/sequence/intrinsic/value_at.hpp>

test/sequence/tuple_comparison.cpp

@@ -1,12 +1,12 @@
 /*=============================================================================
-    Copyright (c) 1999-2003 Jaakko Järvi
+    Copyright (c) 1999-2003 Jaakko Jarvi
     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)
 ==============================================================================*/
 #include <boost/fusion/tuple/tuple.hpp>
-#include <boost/fusion/sequence/adapted/mpl.hpp>
+#include <boost/fusion/adapted/mpl.hpp>
 
 #define FUSION_SEQUENCE tuple
 #include "comparison.hpp"

test/sequence/tuple_construction.cpp

@@ -1,13 +1,14 @@
 /*=============================================================================
-    Copyright (c) 1999-2003 Jaakko Järvi
+    Copyright (c) 1999-2003 Jaakko Jarvi
     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)
 ==============================================================================*/
 #include <boost/fusion/tuple/tuple.hpp>
-#include <boost/fusion/sequence/adapted/mpl.hpp>
+#include <boost/fusion/adapted/mpl.hpp>
 
+#define TR1_TUPLE_TEST
 #define FUSION_SEQUENCE tuple
 #define FUSION_AT get
 #include "construction.hpp"

test/sequence/tuple_copy.cpp

@@ -1,5 +1,5 @@
 /*=============================================================================
-    Copyright (c) 1999-2003 Jaakko Järvi
+    Copyright (c) 1999-2003 Jaakko Jarvi
     Copyright (c) 2001-2006 Joel de Guzman
 
     Distributed under the Boost Software License, Version 1.0. (See accompanying 

test/sequence/tuple_element.cpp

@@ -1,5 +1,5 @@
 /*=============================================================================
-    Copyright (c) 1999-2003 Jaakko Järvi
+    Copyright (c) 1999-2003 Jaakko Jarvi
     Copyright (c) 2001-2006 Joel de Guzman
 
     Distributed under the Boost Software License, Version 1.0. (See accompanying