diff --git a/include/boost/fusion/adapted/array.hpp b/include/boost/fusion/adapted/array.hpp deleted file mode 100644 index 2be9d4ba..00000000 --- a/include/boost/fusion/adapted/array.hpp +++ /dev/null @@ -1,22 +0,0 @@ -/*============================================================================= - 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 -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#endif diff --git a/include/boost/fusion/adapted/boost_tuple.hpp b/include/boost/fusion/adapted/boost_tuple.hpp deleted file mode 100644 index 2924df07..00000000 --- a/include/boost/fusion/adapted/boost_tuple.hpp +++ /dev/null @@ -1,20 +0,0 @@ -/*============================================================================= - 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 -#include -#include -#include -#include -#include -#include -#include -#include - -#endif diff --git a/include/boost/fusion/adapted/mpl.hpp b/include/boost/fusion/adapted/mpl.hpp deleted file mode 100644 index f8257846..00000000 --- a/include/boost/fusion/adapted/mpl.hpp +++ /dev/null @@ -1,21 +0,0 @@ -/*============================================================================= - 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 -#include -#include -#include -#include -#include -#include -#include -#include - -#endif diff --git a/include/boost/fusion/adapted/struct.hpp b/include/boost/fusion/adapted/struct.hpp deleted file mode 100644 index 4b36f179..00000000 --- a/include/boost/fusion/adapted/struct.hpp +++ /dev/null @@ -1,23 +0,0 @@ -/*============================================================================= - 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 -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#endif diff --git a/include/boost/fusion/adapted/variant.hpp b/include/boost/fusion/adapted/variant.hpp deleted file mode 100644 index 5e711c17..00000000 --- a/include/boost/fusion/adapted/variant.hpp +++ /dev/null @@ -1,20 +0,0 @@ -/*============================================================================= - 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 -#include -#include -#include -#include -#include -#include -#include - -#endif diff --git a/include/boost/fusion/algorithm/query/ext_/find_if_s.hpp b/include/boost/fusion/algorithm/query/ext_/find_if_s.hpp index 82c20b4c..2534ba4e 100755 --- a/include/boost/fusion/algorithm/query/ext_/find_if_s.hpp +++ b/include/boost/fusion/algorithm/query/ext_/find_if_s.hpp @@ -14,10 +14,10 @@ #include #include #include -#include +#include #include -#include -#include +#include +#include #include // fwd declarations diff --git a/include/boost/fusion/algorithm/transformation/clear.hpp b/include/boost/fusion/algorithm/transformation/clear.hpp index 75328232..31e4269d 100644 --- a/include/boost/fusion/algorithm/transformation/clear.hpp +++ b/include/boost/fusion/algorithm/transformation/clear.hpp @@ -7,7 +7,7 @@ #if !defined(FUSION_CLEAR_09172005_1127) #define FUSION_CLEAR_09172005_1127 -#include +#include namespace boost { namespace fusion { diff --git a/include/boost/fusion/algorithm/transformation/erase.hpp b/include/boost/fusion/algorithm/transformation/erase.hpp index d0405c30..9e78da27 100644 --- a/include/boost/fusion/algorithm/transformation/erase.hpp +++ b/include/boost/fusion/algorithm/transformation/erase.hpp @@ -1,21 +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_ERASE_07232005_0534) #define FUSION_ERASE_07232005_0534 -#include -#include -#include -#include -#include +#include +#include +#include #include #include #include -#include +#include +#include namespace boost { namespace fusion { @@ -26,7 +25,7 @@ namespace boost { namespace fusion { typedef typename result_of::end::type seq_last_type; typedef typename convert_iterator::type first_type; - typedef typename + typedef typename mpl::if_< result_of::equal_to , first_type @@ -34,19 +33,19 @@ namespace boost { namespace fusion >::type type; - static type + static type call(First const& first, mpl::false_) { return fusion::next(convert_iterator::call(first)); } - static type + static type call(First const& first, mpl::true_) { return convert_iterator::call(first); } - static type + static type call(First const& first) { return call(first, result_of::equal_to()); diff --git a/include/boost/fusion/algorithm/transformation/filter.hpp b/include/boost/fusion/algorithm/transformation/filter.hpp index 52bf6af3..16244649 100644 --- a/include/boost/fusion/algorithm/transformation/filter.hpp +++ b/include/boost/fusion/algorithm/transformation/filter.hpp @@ -8,7 +8,7 @@ #if !defined(FUSION_FILTER_02122005_1839) #define FUSION_FILTER_02122005_1839 -#include +#include #include namespace boost { namespace fusion diff --git a/include/boost/fusion/algorithm/transformation/filter_if.hpp b/include/boost/fusion/algorithm/transformation/filter_if.hpp index d13113b1..4f362882 100644 --- a/include/boost/fusion/algorithm/transformation/filter_if.hpp +++ b/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 +#include namespace boost { namespace fusion { diff --git a/include/boost/fusion/algorithm/transformation/insert.hpp b/include/boost/fusion/algorithm/transformation/insert.hpp index 1702bc19..ebe06f14 100644 --- a/include/boost/fusion/algorithm/transformation/insert.hpp +++ b/include/boost/fusion/algorithm/transformation/insert.hpp @@ -1,21 +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_07222005_0730) #define FUSION_INSERT_07222005_0730 +#include +#include +#include +#include #include -#include -#include -#include -#include -#include #include #include -#include +#include namespace boost { namespace fusion { @@ -43,7 +42,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; diff --git a/include/boost/fusion/algorithm/transformation/insert_range.hpp b/include/boost/fusion/algorithm/transformation/insert_range.hpp index 1915c413..4db840aa 100644 --- a/include/boost/fusion/algorithm/transformation/insert_range.hpp +++ b/include/boost/fusion/algorithm/transformation/insert_range.hpp @@ -1,20 +1,19 @@ /*============================================================================= 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 -#include -#include -#include +#include +#include +#include #include #include #include -#include +#include namespace boost { namespace fusion { diff --git a/include/boost/fusion/algorithm/transformation/join.hpp b/include/boost/fusion/algorithm/transformation/join.hpp index 4ed78b5f..10a5eecc 100644 --- a/include/boost/fusion/algorithm/transformation/join.hpp +++ b/include/boost/fusion/algorithm/transformation/join.hpp @@ -8,7 +8,7 @@ #if !defined(FUSION_JOIN_200601222109) #define FUSION_JOIN_200601222109 -#include +#include namespace boost { namespace fusion { diff --git a/include/boost/fusion/algorithm/transformation/pop_back.hpp b/include/boost/fusion/algorithm/transformation/pop_back.hpp index 6eb743fd..c83d5904 100644 --- a/include/boost/fusion/algorithm/transformation/pop_back.hpp +++ b/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 +#include #include #include #include diff --git a/include/boost/fusion/algorithm/transformation/pop_front.hpp b/include/boost/fusion/algorithm/transformation/pop_front.hpp index aed524d3..d01e3754 100644 --- a/include/boost/fusion/algorithm/transformation/pop_front.hpp +++ b/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 +#include #include #include #include diff --git a/include/boost/fusion/algorithm/transformation/push_back.hpp b/include/boost/fusion/algorithm/transformation/push_back.hpp index 4fadc79c..98f63702 100644 --- a/include/boost/fusion/algorithm/transformation/push_back.hpp +++ b/include/boost/fusion/algorithm/transformation/push_back.hpp @@ -8,8 +8,8 @@ #define FUSION_PUSH_BACK_07162005_0235 #include -#include -#include +#include +#include namespace boost { namespace fusion { diff --git a/include/boost/fusion/algorithm/transformation/push_front.hpp b/include/boost/fusion/algorithm/transformation/push_front.hpp index 10f9fc10..526e28f1 100644 --- a/include/boost/fusion/algorithm/transformation/push_front.hpp +++ b/include/boost/fusion/algorithm/transformation/push_front.hpp @@ -8,8 +8,8 @@ #define FUSION_PUSH_FRONT_07162005_0749 #include -#include -#include +#include +#include namespace boost { namespace fusion { diff --git a/include/boost/fusion/algorithm/transformation/remove.hpp b/include/boost/fusion/algorithm/transformation/remove.hpp index 01718d32..1eb4bfb3 100644 --- a/include/boost/fusion/algorithm/transformation/remove.hpp +++ b/include/boost/fusion/algorithm/transformation/remove.hpp @@ -7,7 +7,7 @@ #if !defined(FUSION_REMOVE_07162005_0818) #define FUSION_REMOVE_07162005_0818 -#include +#include #include #include diff --git a/include/boost/fusion/algorithm/transformation/remove_if.hpp b/include/boost/fusion/algorithm/transformation/remove_if.hpp index ab13694d..c2140d17 100644 --- a/include/boost/fusion/algorithm/transformation/remove_if.hpp +++ b/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 +#include #include #include diff --git a/include/boost/fusion/algorithm/transformation/replace.hpp b/include/boost/fusion/algorithm/transformation/replace.hpp index 780f1a45..43657f99 100644 --- a/include/boost/fusion/algorithm/transformation/replace.hpp +++ b/include/boost/fusion/algorithm/transformation/replace.hpp @@ -7,7 +7,7 @@ #if !defined(FUSION_REPLACE_08182005_0830) #define FUSION_REPLACE_08182005_0830 -#include +#include #include namespace boost { namespace fusion diff --git a/include/boost/fusion/algorithm/transformation/replace_if.hpp b/include/boost/fusion/algorithm/transformation/replace_if.hpp index 90db5683..07abbdca 100644 --- a/include/boost/fusion/algorithm/transformation/replace_if.hpp +++ b/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 +#include #include #include #include diff --git a/include/boost/fusion/algorithm/transformation/reverse.hpp b/include/boost/fusion/algorithm/transformation/reverse.hpp index b95461c8..faf78114 100644 --- a/include/boost/fusion/algorithm/transformation/reverse.hpp +++ b/include/boost/fusion/algorithm/transformation/reverse.hpp @@ -7,7 +7,7 @@ #if !defined(FUSION_REVERSE_07212005_1230) #define FUSION_REVERSE_07212005_1230 -#include +#include namespace boost { namespace fusion { diff --git a/include/boost/fusion/algorithm/transformation/transform.hpp b/include/boost/fusion/algorithm/transformation/transform.hpp index d9f06e7c..0315a8d0 100644 --- a/include/boost/fusion/algorithm/transformation/transform.hpp +++ b/include/boost/fusion/algorithm/transformation/transform.hpp @@ -7,7 +7,7 @@ #if !defined(FUSION_TRANSFORM_07052005_1057) #define FUSION_TRANSFORM_07052005_1057 -#include +#include namespace boost { namespace fusion { diff --git a/include/boost/fusion/algorithm/transformation/zip.hpp b/include/boost/fusion/algorithm/transformation/zip.hpp index a2f66bfd..33b7d25b 100644 --- a/include/boost/fusion/algorithm/transformation/zip.hpp +++ b/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 -#include -#include -#include +#include +#include +#include +#include #include #include #include diff --git a/include/boost/fusion/container/deque/detail/convert_impl.hpp b/include/boost/fusion/container/deque/detail/convert_impl.hpp deleted file mode 100644 index ac310a19..00000000 --- a/include/boost/fusion/container/deque/detail/convert_impl.hpp +++ /dev/null @@ -1,45 +0,0 @@ -/*============================================================================= - 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(FUSION_CONVERT_IMPL_20061213_2207) -#define FUSION_CONVERT_IMPL_20061213_2207 - -#include -#include -#include -#include - -namespace boost { namespace fusion -{ - struct deque_tag; - - namespace extension - { - template - struct convert_impl; - - template <> - struct convert_impl - { - template - struct apply - { - typedef typename detail::as_deque::value> gen; - typedef typename gen:: - template apply::type>::type - type; - - static type call(Sequence& seq) - { - return gen::call(fusion::begin(seq)); - } - }; - }; - } -}} - -#endif diff --git a/include/boost/fusion/container/list/detail/convert_impl.hpp b/include/boost/fusion/container/list/detail/convert_impl.hpp deleted file mode 100644 index cfe7a1df..00000000 --- a/include/boost/fusion/container/list/detail/convert_impl.hpp +++ /dev/null @@ -1,51 +0,0 @@ -/*============================================================================= - 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(FUSION_CONVERT_IMPL_09232005_1215) -#define FUSION_CONVERT_IMPL_09232005_1215 - -#include -#include -#include -#include -#include - -namespace boost { namespace fusion -{ - struct cons_tag; - - namespace extension - { - template - struct convert_impl; - - template <> - struct convert_impl - { - template - struct apply - { - typedef typename - detail::build_cons< - typename result_of::begin::type - , typename result_of::end::type - > - build_cons; - - typedef typename build_cons::type type; - - static type - call(Sequence& seq) - { - return build_cons::call(fusion::begin(seq), fusion::end(seq)); - } - }; - }; - } -}} - -#endif diff --git a/include/boost/fusion/container/map/detail/convert_impl.hpp b/include/boost/fusion/container/map/detail/convert_impl.hpp deleted file mode 100644 index aedd3e3d..00000000 --- a/include/boost/fusion/container/map/detail/convert_impl.hpp +++ /dev/null @@ -1,45 +0,0 @@ -/*============================================================================= - 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(FUSION_CONVERT_IMPL_09232005_1340) -#define FUSION_CONVERT_IMPL_09232005_1340 - -#include -#include -#include -#include - -namespace boost { namespace fusion -{ - struct map_tag; - - namespace extension - { - template - struct convert_impl; - - template <> - struct convert_impl - { - template - struct apply - { - typedef typename detail::as_map::value> gen; - typedef typename gen:: - template apply::type>::type - type; - - static type call(Sequence& seq) - { - return gen::call(fusion::begin(seq)); - } - }; - }; - } -}} - -#endif diff --git a/include/boost/fusion/container/set/detail/convert_impl.hpp b/include/boost/fusion/container/set/detail/convert_impl.hpp deleted file mode 100644 index 1aa79fb1..00000000 --- a/include/boost/fusion/container/set/detail/convert_impl.hpp +++ /dev/null @@ -1,45 +0,0 @@ -/*============================================================================= - 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(FUSION_CONVERT_IMPL_09232005_1341) -#define FUSION_CONVERT_IMPL_09232005_1341 - -#include -#include -#include -#include - -namespace boost { namespace fusion -{ - struct set_tag; - - namespace extension - { - template - struct convert_impl; - - template <> - struct convert_impl - { - template - struct apply - { - typedef typename detail::as_set::value> gen; - typedef typename gen:: - template apply::type>::type - type; - - static type call(Sequence& seq) - { - return gen::call(fusion::begin(seq)); - } - }; - }; - } -}} - -#endif diff --git a/include/boost/fusion/container/vector.hpp b/include/boost/fusion/container/vector.hpp deleted file mode 100644 index 389a102e..00000000 --- a/include/boost/fusion/container/vector.hpp +++ /dev/null @@ -1,21 +0,0 @@ -/*============================================================================= - 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(FUSION_SEQUENCE_CLASS_VECTOR_10022005_0602) -#define FUSION_SEQUENCE_CLASS_VECTOR_10022005_0602 - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#endif diff --git a/include/boost/fusion/container/vector/detail/convert_impl.hpp b/include/boost/fusion/container/vector/detail/convert_impl.hpp deleted file mode 100644 index 5e1d080f..00000000 --- a/include/boost/fusion/container/vector/detail/convert_impl.hpp +++ /dev/null @@ -1,45 +0,0 @@ -/*============================================================================= - 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(FUSION_CONVERT_IMPL_09222005_1104) -#define FUSION_CONVERT_IMPL_09222005_1104 - -#include -#include -#include -#include - -namespace boost { namespace fusion -{ - struct vector_tag; - - namespace extension - { - template - struct convert_impl; - - template <> - struct convert_impl - { - template - struct apply - { - typedef typename detail::as_vector::value> gen; - typedef typename gen:: - template apply::type>::type - type; - - static type call(Sequence& seq) - { - return gen::call(fusion::begin(seq)); - } - }; - }; - } -}} - -#endif diff --git a/include/boost/fusion/functional/adapter/limits.hpp b/include/boost/fusion/functional/adapter/limits.hpp index cf6701c4..476fe021 100644 --- a/include/boost/fusion/functional/adapter/limits.hpp +++ b/include/boost/fusion/functional/adapter/limits.hpp @@ -9,7 +9,7 @@ #if !defined(BOOST_FUSION_FUNCTIONAL_ADAPTER_LIMITS_HPP_INCLUDED) # define BOOST_FUSION_FUNCTIONAL_ADAPTER_LIMITS_HPP_INCLUDED -# include +# include # if !defined(BOOST_FUSION_UNFUSED_GENERIC_MAX_ARITY) # define BOOST_FUSION_UNFUSED_GENERIC_MAX_ARITY 6 diff --git a/include/boost/fusion/functional/adapter/unfused_generic.hpp b/include/boost/fusion/functional/adapter/unfused_generic.hpp index 82b1e4b0..69191ef3 100644 --- a/include/boost/fusion/functional/adapter/unfused_generic.hpp +++ b/include/boost/fusion/functional/adapter/unfused_generic.hpp @@ -18,7 +18,7 @@ #include #include -#include +#include #include #include diff --git a/include/boost/fusion/functional/adapter/unfused_lvalue_args.hpp b/include/boost/fusion/functional/adapter/unfused_lvalue_args.hpp index ba2f31b6..7b801cf7 100644 --- a/include/boost/fusion/functional/adapter/unfused_lvalue_args.hpp +++ b/include/boost/fusion/functional/adapter/unfused_lvalue_args.hpp @@ -17,7 +17,7 @@ #include -#include +#include #include #include diff --git a/include/boost/fusion/functional/adapter/unfused_rvalue_args.hpp b/include/boost/fusion/functional/adapter/unfused_rvalue_args.hpp index 3c80475e..eea0fec9 100644 --- a/include/boost/fusion/functional/adapter/unfused_rvalue_args.hpp +++ b/include/boost/fusion/functional/adapter/unfused_rvalue_args.hpp @@ -17,7 +17,7 @@ #include -#include +#include #include #include diff --git a/include/boost/fusion/functional/adapter/unfused_typed.hpp b/include/boost/fusion/functional/adapter/unfused_typed.hpp index 9ee3a7a6..94385a35 100644 --- a/include/boost/fusion/functional/adapter/unfused_typed.hpp +++ b/include/boost/fusion/functional/adapter/unfused_typed.hpp @@ -22,8 +22,8 @@ #include #include #include -#include -#include +#include +#include #include #include diff --git a/include/boost/fusion/include/adapt_struct.hpp b/include/boost/fusion/include/adapt_struct.hpp index facc8970..2fab5de7 100644 --- a/include/boost/fusion/include/adapt_struct.hpp +++ b/include/boost/fusion/include/adapt_struct.hpp @@ -7,6 +7,6 @@ #if !defined(FUSION_INCLUDE_ADAPT_STRUCT) #define FUSION_INCLUDE_ADAPT_STRUCT -#include +#include #endif diff --git a/include/boost/fusion/include/as_vector.hpp b/include/boost/fusion/include/as_vector.hpp index 4c9b39d0..2136b492 100644 --- a/include/boost/fusion/include/as_vector.hpp +++ b/include/boost/fusion/include/as_vector.hpp @@ -7,6 +7,6 @@ #if !defined(FUSION_INCLUDE_AS_VECTOR) #define FUSION_INCLUDE_AS_VECTOR -#include +#include #endif diff --git a/include/boost/fusion/include/joint_view.hpp b/include/boost/fusion/include/joint_view.hpp index e3d1e204..c60e34e5 100644 --- a/include/boost/fusion/include/joint_view.hpp +++ b/include/boost/fusion/include/joint_view.hpp @@ -7,6 +7,6 @@ #if !defined(FUSION_INCLUDE_JOINT_VIEW) #define FUSION_INCLUDE_JOINT_VIEW -#include +#include #endif diff --git a/include/boost/fusion/include/list.hpp b/include/boost/fusion/include/list.hpp index 4eb8e767..fb5c0b42 100644 --- a/include/boost/fusion/include/list.hpp +++ b/include/boost/fusion/include/list.hpp @@ -7,6 +7,6 @@ #if !defined(FUSION_INCLUDE_LIST) #define FUSION_INCLUDE_LIST -#include +#include #endif diff --git a/include/boost/fusion/include/mpl.hpp b/include/boost/fusion/include/mpl.hpp index 8a1cbfd0..5e3f906d 100644 --- a/include/boost/fusion/include/mpl.hpp +++ b/include/boost/fusion/include/mpl.hpp @@ -7,7 +7,7 @@ #if !defined(FUSION_INCLUDE_MPL) #define FUSION_INCLUDE_MPL -#include -#include +#include +#include #endif diff --git a/include/boost/fusion/include/single_view.hpp b/include/boost/fusion/include/single_view.hpp index a95d04a8..ae60d867 100644 --- a/include/boost/fusion/include/single_view.hpp +++ b/include/boost/fusion/include/single_view.hpp @@ -7,6 +7,6 @@ #if !defined(FUSION_INCLUDE_SINGLE_VIEW) #define FUSION_INCLUDE_SINGLE_VIEW -#include +#include #endif diff --git a/include/boost/fusion/include/std_pair.hpp b/include/boost/fusion/include/std_pair.hpp index 98f37c86..bb4d5952 100644 --- a/include/boost/fusion/include/std_pair.hpp +++ b/include/boost/fusion/include/std_pair.hpp @@ -7,6 +7,6 @@ #if !defined(FUSION_INCLUDE_STD_PAIR) #define FUSION_INCLUDE_STD_PAIR -#include +#include #endif diff --git a/include/boost/fusion/include/transform_view.hpp b/include/boost/fusion/include/transform_view.hpp index 3aceaaee..7564c6ab 100644 --- a/include/boost/fusion/include/transform_view.hpp +++ b/include/boost/fusion/include/transform_view.hpp @@ -7,6 +7,6 @@ #if !defined(FUSION_INCLUDE_TRANSFORM_VIEW) #define FUSION_INCLUDE_TRANSFORM_VIEW -#include +#include #endif diff --git a/include/boost/fusion/include/variant.hpp b/include/boost/fusion/include/variant.hpp index 3d013b8e..824b8a6a 100644 --- a/include/boost/fusion/include/variant.hpp +++ b/include/boost/fusion/include/variant.hpp @@ -7,6 +7,6 @@ #if !defined(FUSION_INCLUDE_VARIANT) #define FUSION_INCLUDE_VARIANT -#include +#include #endif diff --git a/include/boost/fusion/include/vector.hpp b/include/boost/fusion/include/vector.hpp index d1495c0a..e49568e2 100644 --- a/include/boost/fusion/include/vector.hpp +++ b/include/boost/fusion/include/vector.hpp @@ -7,6 +7,6 @@ #if !defined(FUSION_INCLUDE_VECTOR) #define FUSION_INCLUDE_VECTOR -#include +#include #endif diff --git a/include/boost/fusion/iterator/mpl/convert_iterator.hpp b/include/boost/fusion/iterator/mpl/convert_iterator.hpp index 5716ce4e..fc2efacf 100644 --- a/include/boost/fusion/iterator/mpl/convert_iterator.hpp +++ b/include/boost/fusion/iterator/mpl/convert_iterator.hpp @@ -1,21 +1,19 @@ /*============================================================================= 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_CONVERT_ITERATOR_05062005_1218) #define FUSION_CONVERT_ITERATOR_05062005_1218 #include +#include #include #include namespace boost { namespace fusion { - template - struct mpl_iterator; // forward declaration - // Test T. If it is a fusion iterator, return a reference to it. // else, assume it is an mpl iterator. diff --git a/include/boost/fusion/mpl.hpp b/include/boost/fusion/mpl.hpp index e499df93..6eb2538b 100644 --- a/include/boost/fusion/mpl.hpp +++ b/include/boost/fusion/mpl.hpp @@ -1,7 +1,7 @@ /*============================================================================= 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_MPL_09172006_2049) @@ -9,24 +9,7 @@ // The fusion <--> MPL link headers #include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include #endif diff --git a/include/boost/fusion/sequence.hpp b/include/boost/fusion/sequence.hpp index e60fdd7d..9a794c2e 100644 --- a/include/boost/fusion/sequence.hpp +++ b/include/boost/fusion/sequence.hpp @@ -8,10 +8,13 @@ #define FUSION_ITERATOR_10022005_0559 #include +#include #include +#include #include #include #include -#include +#include +#include #endif diff --git a/include/boost/fusion/adapted.hpp b/include/boost/fusion/sequence/adapted.hpp similarity index 65% rename from include/boost/fusion/adapted.hpp rename to include/boost/fusion/sequence/adapted.hpp index 23693645..ea951f19 100644 --- a/include/boost/fusion/adapted.hpp +++ b/include/boost/fusion/sequence/adapted.hpp @@ -8,10 +8,10 @@ #if !defined(BOOST_FUSION_ADAPTED_30122005_1420) #define BOOST_FUSION_ADAPTED_30122005_1420 -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #endif diff --git a/include/boost/fusion/sequence/adapted/array.hpp b/include/boost/fusion/sequence/adapted/array.hpp new file mode 100644 index 00000000..0e1537f8 --- /dev/null +++ b/include/boost/fusion/sequence/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 +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#endif diff --git a/include/boost/fusion/adapted/array/array_iterator.hpp b/include/boost/fusion/sequence/adapted/array/array_iterator.hpp similarity index 100% rename from include/boost/fusion/adapted/array/array_iterator.hpp rename to include/boost/fusion/sequence/adapted/array/array_iterator.hpp diff --git a/include/boost/fusion/adapted/array/detail/at_impl.hpp b/include/boost/fusion/sequence/adapted/array/detail/at_impl.hpp similarity index 100% rename from include/boost/fusion/adapted/array/detail/at_impl.hpp rename to include/boost/fusion/sequence/adapted/array/detail/at_impl.hpp diff --git a/include/boost/fusion/adapted/array/detail/begin_impl.hpp b/include/boost/fusion/sequence/adapted/array/detail/begin_impl.hpp similarity index 94% rename from include/boost/fusion/adapted/array/detail/begin_impl.hpp rename to include/boost/fusion/sequence/adapted/array/detail/begin_impl.hpp index 06dc8c51..fc4fb6a3 100644 --- a/include/boost/fusion/adapted/array/detail/begin_impl.hpp +++ b/include/boost/fusion/sequence/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 +#include namespace boost { namespace fusion { diff --git a/include/boost/fusion/adapted/array/detail/category_of_impl.hpp b/include/boost/fusion/sequence/adapted/array/detail/category_of_impl.hpp similarity index 100% rename from include/boost/fusion/adapted/array/detail/category_of_impl.hpp rename to include/boost/fusion/sequence/adapted/array/detail/category_of_impl.hpp diff --git a/include/boost/fusion/adapted/array/detail/end_impl.hpp b/include/boost/fusion/sequence/adapted/array/detail/end_impl.hpp similarity index 94% rename from include/boost/fusion/adapted/array/detail/end_impl.hpp rename to include/boost/fusion/sequence/adapted/array/detail/end_impl.hpp index c9432c9b..a3ffbed4 100644 --- a/include/boost/fusion/adapted/array/detail/end_impl.hpp +++ b/include/boost/fusion/sequence/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 +#include namespace boost { namespace fusion { diff --git a/include/boost/fusion/adapted/array/detail/is_sequence_impl.hpp b/include/boost/fusion/sequence/adapted/array/detail/is_sequence_impl.hpp similarity index 100% rename from include/boost/fusion/adapted/array/detail/is_sequence_impl.hpp rename to include/boost/fusion/sequence/adapted/array/detail/is_sequence_impl.hpp diff --git a/include/boost/fusion/adapted/array/detail/is_view_impl.hpp b/include/boost/fusion/sequence/adapted/array/detail/is_view_impl.hpp similarity index 100% rename from include/boost/fusion/adapted/array/detail/is_view_impl.hpp rename to include/boost/fusion/sequence/adapted/array/detail/is_view_impl.hpp diff --git a/include/boost/fusion/adapted/array/detail/size_impl.hpp b/include/boost/fusion/sequence/adapted/array/detail/size_impl.hpp similarity index 100% rename from include/boost/fusion/adapted/array/detail/size_impl.hpp rename to include/boost/fusion/sequence/adapted/array/detail/size_impl.hpp diff --git a/include/boost/fusion/adapted/array/detail/value_at_impl.hpp b/include/boost/fusion/sequence/adapted/array/detail/value_at_impl.hpp similarity index 100% rename from include/boost/fusion/adapted/array/detail/value_at_impl.hpp rename to include/boost/fusion/sequence/adapted/array/detail/value_at_impl.hpp diff --git a/include/boost/fusion/adapted/array/tag_of.hpp b/include/boost/fusion/sequence/adapted/array/tag_of.hpp similarity index 100% rename from include/boost/fusion/adapted/array/tag_of.hpp rename to include/boost/fusion/sequence/adapted/array/tag_of.hpp diff --git a/include/boost/fusion/sequence/adapted/boost_tuple.hpp b/include/boost/fusion/sequence/adapted/boost_tuple.hpp new file mode 100644 index 00000000..14288087 --- /dev/null +++ b/include/boost/fusion/sequence/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 +#include +#include +#include +#include +#include +#include +#include +#include + +#endif diff --git a/include/boost/fusion/adapted/boost_tuple/boost_tuple_iterator.hpp b/include/boost/fusion/sequence/adapted/boost_tuple/boost_tuple_iterator.hpp similarity index 100% rename from include/boost/fusion/adapted/boost_tuple/boost_tuple_iterator.hpp rename to include/boost/fusion/sequence/adapted/boost_tuple/boost_tuple_iterator.hpp diff --git a/include/boost/fusion/adapted/boost_tuple/detail/at_impl.hpp b/include/boost/fusion/sequence/adapted/boost_tuple/detail/at_impl.hpp similarity index 100% rename from include/boost/fusion/adapted/boost_tuple/detail/at_impl.hpp rename to include/boost/fusion/sequence/adapted/boost_tuple/detail/at_impl.hpp diff --git a/include/boost/fusion/adapted/boost_tuple/detail/begin_impl.hpp b/include/boost/fusion/sequence/adapted/boost_tuple/detail/begin_impl.hpp similarity index 92% rename from include/boost/fusion/adapted/boost_tuple/detail/begin_impl.hpp rename to include/boost/fusion/sequence/adapted/boost_tuple/detail/begin_impl.hpp index ee9a89eb..aaa6a670 100644 --- a/include/boost/fusion/adapted/boost_tuple/detail/begin_impl.hpp +++ b/include/boost/fusion/sequence/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 +#include namespace boost { namespace fusion { diff --git a/include/boost/fusion/adapted/boost_tuple/detail/category_of_impl.hpp b/include/boost/fusion/sequence/adapted/boost_tuple/detail/category_of_impl.hpp similarity index 100% rename from include/boost/fusion/adapted/boost_tuple/detail/category_of_impl.hpp rename to include/boost/fusion/sequence/adapted/boost_tuple/detail/category_of_impl.hpp diff --git a/include/boost/fusion/adapted/boost_tuple/detail/end_impl.hpp b/include/boost/fusion/sequence/adapted/boost_tuple/detail/end_impl.hpp similarity index 94% rename from include/boost/fusion/adapted/boost_tuple/detail/end_impl.hpp rename to include/boost/fusion/sequence/adapted/boost_tuple/detail/end_impl.hpp index 2fb27a7a..016bca3f 100644 --- a/include/boost/fusion/adapted/boost_tuple/detail/end_impl.hpp +++ b/include/boost/fusion/sequence/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 +#include #include #include diff --git a/include/boost/fusion/adapted/boost_tuple/detail/is_sequence_impl.hpp b/include/boost/fusion/sequence/adapted/boost_tuple/detail/is_sequence_impl.hpp similarity index 100% rename from include/boost/fusion/adapted/boost_tuple/detail/is_sequence_impl.hpp rename to include/boost/fusion/sequence/adapted/boost_tuple/detail/is_sequence_impl.hpp diff --git a/include/boost/fusion/adapted/boost_tuple/detail/is_view_impl.hpp b/include/boost/fusion/sequence/adapted/boost_tuple/detail/is_view_impl.hpp similarity index 100% rename from include/boost/fusion/adapted/boost_tuple/detail/is_view_impl.hpp rename to include/boost/fusion/sequence/adapted/boost_tuple/detail/is_view_impl.hpp diff --git a/include/boost/fusion/adapted/boost_tuple/detail/size_impl.hpp b/include/boost/fusion/sequence/adapted/boost_tuple/detail/size_impl.hpp similarity index 100% rename from include/boost/fusion/adapted/boost_tuple/detail/size_impl.hpp rename to include/boost/fusion/sequence/adapted/boost_tuple/detail/size_impl.hpp diff --git a/include/boost/fusion/adapted/boost_tuple/detail/value_at_impl.hpp b/include/boost/fusion/sequence/adapted/boost_tuple/detail/value_at_impl.hpp similarity index 100% rename from include/boost/fusion/adapted/boost_tuple/detail/value_at_impl.hpp rename to include/boost/fusion/sequence/adapted/boost_tuple/detail/value_at_impl.hpp diff --git a/include/boost/fusion/adapted/boost_tuple/tag_of.hpp b/include/boost/fusion/sequence/adapted/boost_tuple/tag_of.hpp similarity index 100% rename from include/boost/fusion/adapted/boost_tuple/tag_of.hpp rename to include/boost/fusion/sequence/adapted/boost_tuple/tag_of.hpp diff --git a/include/boost/fusion/sequence/adapted/mpl.hpp b/include/boost/fusion/sequence/adapted/mpl.hpp new file mode 100644 index 00000000..94f4967a --- /dev/null +++ b/include/boost/fusion/sequence/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 +#include +#include +#include +#include +#include +#include +#include +#include + +#endif diff --git a/include/boost/fusion/adapted/mpl/detail/at_impl.hpp b/include/boost/fusion/sequence/adapted/mpl/detail/at_impl.hpp similarity index 100% rename from include/boost/fusion/adapted/mpl/detail/at_impl.hpp rename to include/boost/fusion/sequence/adapted/mpl/detail/at_impl.hpp diff --git a/include/boost/fusion/adapted/mpl/detail/begin_impl.hpp b/include/boost/fusion/sequence/adapted/mpl/detail/begin_impl.hpp similarity index 95% rename from include/boost/fusion/adapted/mpl/detail/begin_impl.hpp rename to include/boost/fusion/sequence/adapted/mpl/detail/begin_impl.hpp index 1ec77d8b..04e09e44 100644 --- a/include/boost/fusion/adapted/mpl/detail/begin_impl.hpp +++ b/include/boost/fusion/sequence/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 +#include #include #include diff --git a/include/boost/fusion/adapted/mpl/detail/category_of_impl.hpp b/include/boost/fusion/sequence/adapted/mpl/detail/category_of_impl.hpp similarity index 100% rename from include/boost/fusion/adapted/mpl/detail/category_of_impl.hpp rename to include/boost/fusion/sequence/adapted/mpl/detail/category_of_impl.hpp diff --git a/include/boost/fusion/adapted/mpl/detail/empty_impl.hpp b/include/boost/fusion/sequence/adapted/mpl/detail/empty_impl.hpp similarity index 100% rename from include/boost/fusion/adapted/mpl/detail/empty_impl.hpp rename to include/boost/fusion/sequence/adapted/mpl/detail/empty_impl.hpp diff --git a/include/boost/fusion/adapted/mpl/detail/end_impl.hpp b/include/boost/fusion/sequence/adapted/mpl/detail/end_impl.hpp similarity index 95% rename from include/boost/fusion/adapted/mpl/detail/end_impl.hpp rename to include/boost/fusion/sequence/adapted/mpl/detail/end_impl.hpp index e3466956..6b3d7933 100644 --- a/include/boost/fusion/adapted/mpl/detail/end_impl.hpp +++ b/include/boost/fusion/sequence/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 +#include #include #include diff --git a/include/boost/fusion/adapted/mpl/detail/has_key_impl.hpp b/include/boost/fusion/sequence/adapted/mpl/detail/has_key_impl.hpp similarity index 100% rename from include/boost/fusion/adapted/mpl/detail/has_key_impl.hpp rename to include/boost/fusion/sequence/adapted/mpl/detail/has_key_impl.hpp diff --git a/include/boost/fusion/adapted/mpl/detail/is_sequence_impl.hpp b/include/boost/fusion/sequence/adapted/mpl/detail/is_sequence_impl.hpp similarity index 100% rename from include/boost/fusion/adapted/mpl/detail/is_sequence_impl.hpp rename to include/boost/fusion/sequence/adapted/mpl/detail/is_sequence_impl.hpp diff --git a/include/boost/fusion/adapted/mpl/detail/is_view_impl.hpp b/include/boost/fusion/sequence/adapted/mpl/detail/is_view_impl.hpp similarity index 100% rename from include/boost/fusion/adapted/mpl/detail/is_view_impl.hpp rename to include/boost/fusion/sequence/adapted/mpl/detail/is_view_impl.hpp diff --git a/include/boost/fusion/adapted/mpl/detail/size_impl.hpp b/include/boost/fusion/sequence/adapted/mpl/detail/size_impl.hpp similarity index 100% rename from include/boost/fusion/adapted/mpl/detail/size_impl.hpp rename to include/boost/fusion/sequence/adapted/mpl/detail/size_impl.hpp diff --git a/include/boost/fusion/adapted/mpl/detail/value_at_impl.hpp b/include/boost/fusion/sequence/adapted/mpl/detail/value_at_impl.hpp similarity index 100% rename from include/boost/fusion/adapted/mpl/detail/value_at_impl.hpp rename to include/boost/fusion/sequence/adapted/mpl/detail/value_at_impl.hpp diff --git a/include/boost/fusion/adapted/mpl/mpl_iterator.hpp b/include/boost/fusion/sequence/adapted/mpl/mpl_iterator.hpp similarity index 100% rename from include/boost/fusion/adapted/mpl/mpl_iterator.hpp rename to include/boost/fusion/sequence/adapted/mpl/mpl_iterator.hpp diff --git a/include/boost/fusion/adapted/std_pair.hpp b/include/boost/fusion/sequence/adapted/std_pair.hpp similarity index 96% rename from include/boost/fusion/adapted/std_pair.hpp rename to include/boost/fusion/sequence/adapted/std_pair.hpp index d13b810a..0b755a0b 100644 --- a/include/boost/fusion/adapted/std_pair.hpp +++ b/include/boost/fusion/sequence/adapted/std_pair.hpp @@ -9,7 +9,7 @@ #define BOOST_FUSION_STD_PAIR_24122005_1744 #include -#include +#include #include #include diff --git a/include/boost/fusion/adapted/std_pair/detail/at_impl.hpp b/include/boost/fusion/sequence/adapted/std_pair/detail/at_impl.hpp similarity index 100% rename from include/boost/fusion/adapted/std_pair/detail/at_impl.hpp rename to include/boost/fusion/sequence/adapted/std_pair/detail/at_impl.hpp diff --git a/include/boost/fusion/adapted/std_pair/detail/begin_impl.hpp b/include/boost/fusion/sequence/adapted/std_pair/detail/begin_impl.hpp similarity index 93% rename from include/boost/fusion/adapted/std_pair/detail/begin_impl.hpp rename to include/boost/fusion/sequence/adapted/std_pair/detail/begin_impl.hpp index 1fd48f51..1b77b7a7 100644 --- a/include/boost/fusion/adapted/std_pair/detail/begin_impl.hpp +++ b/include/boost/fusion/sequence/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 +#include namespace boost { namespace fusion { diff --git a/include/boost/fusion/adapted/std_pair/detail/category_of_impl.hpp b/include/boost/fusion/sequence/adapted/std_pair/detail/category_of_impl.hpp similarity index 100% rename from include/boost/fusion/adapted/std_pair/detail/category_of_impl.hpp rename to include/boost/fusion/sequence/adapted/std_pair/detail/category_of_impl.hpp diff --git a/include/boost/fusion/adapted/std_pair/detail/end_impl.hpp b/include/boost/fusion/sequence/adapted/std_pair/detail/end_impl.hpp similarity index 93% rename from include/boost/fusion/adapted/std_pair/detail/end_impl.hpp rename to include/boost/fusion/sequence/adapted/std_pair/detail/end_impl.hpp index 747f2c6f..9aab76c5 100644 --- a/include/boost/fusion/adapted/std_pair/detail/end_impl.hpp +++ b/include/boost/fusion/sequence/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 +#include namespace boost { namespace fusion { diff --git a/include/boost/fusion/adapted/std_pair/detail/is_sequence_impl.hpp b/include/boost/fusion/sequence/adapted/std_pair/detail/is_sequence_impl.hpp similarity index 100% rename from include/boost/fusion/adapted/std_pair/detail/is_sequence_impl.hpp rename to include/boost/fusion/sequence/adapted/std_pair/detail/is_sequence_impl.hpp diff --git a/include/boost/fusion/adapted/std_pair/detail/is_view_impl.hpp b/include/boost/fusion/sequence/adapted/std_pair/detail/is_view_impl.hpp similarity index 100% rename from include/boost/fusion/adapted/std_pair/detail/is_view_impl.hpp rename to include/boost/fusion/sequence/adapted/std_pair/detail/is_view_impl.hpp diff --git a/include/boost/fusion/adapted/std_pair/detail/size_impl.hpp b/include/boost/fusion/sequence/adapted/std_pair/detail/size_impl.hpp similarity index 100% rename from include/boost/fusion/adapted/std_pair/detail/size_impl.hpp rename to include/boost/fusion/sequence/adapted/std_pair/detail/size_impl.hpp diff --git a/include/boost/fusion/adapted/std_pair/detail/value_at_impl.hpp b/include/boost/fusion/sequence/adapted/std_pair/detail/value_at_impl.hpp similarity index 100% rename from include/boost/fusion/adapted/std_pair/detail/value_at_impl.hpp rename to include/boost/fusion/sequence/adapted/std_pair/detail/value_at_impl.hpp diff --git a/include/boost/fusion/adapted/std_pair/std_pair_iterator.hpp b/include/boost/fusion/sequence/adapted/std_pair/std_pair_iterator.hpp similarity index 100% rename from include/boost/fusion/adapted/std_pair/std_pair_iterator.hpp rename to include/boost/fusion/sequence/adapted/std_pair/std_pair_iterator.hpp diff --git a/include/boost/fusion/adapted/std_pair/tag_of.hpp b/include/boost/fusion/sequence/adapted/std_pair/tag_of.hpp similarity index 100% rename from include/boost/fusion/adapted/std_pair/tag_of.hpp rename to include/boost/fusion/sequence/adapted/std_pair/tag_of.hpp diff --git a/include/boost/fusion/sequence/adapted/struct.hpp b/include/boost/fusion/sequence/adapted/struct.hpp new file mode 100644 index 00000000..f4aed34e --- /dev/null +++ b/include/boost/fusion/sequence/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 +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#endif diff --git a/include/boost/fusion/adapted/struct/adapt_assoc_struct.hpp b/include/boost/fusion/sequence/adapted/struct/adapt_assoc_struct.hpp similarity index 83% rename from include/boost/fusion/adapted/struct/adapt_assoc_struct.hpp rename to include/boost/fusion/sequence/adapted/struct/adapt_assoc_struct.hpp index e621187f..44357c00 100644 --- a/include/boost/fusion/adapted/struct/adapt_assoc_struct.hpp +++ b/include/boost/fusion/sequence/adapted/struct/adapt_assoc_struct.hpp @@ -9,19 +9,19 @@ #define BOOST_FUSION_ADAPT_ASSOC_STRUCT_20070508_2207 #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/include/boost/fusion/adapted/struct/adapt_struct.hpp b/include/boost/fusion/sequence/adapted/struct/adapt_struct.hpp similarity index 84% rename from include/boost/fusion/adapted/struct/adapt_struct.hpp rename to include/boost/fusion/sequence/adapted/struct/adapt_struct.hpp index e8eb6a67..38d03edb 100644 --- a/include/boost/fusion/adapted/struct/adapt_struct.hpp +++ b/include/boost/fusion/sequence/adapted/struct/adapt_struct.hpp @@ -8,16 +8,16 @@ #define BOOST_FUSION_ADAPT_STRUCT_APRIL_2_2007_1158AM #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/include/boost/fusion/adapted/struct/detail/at_impl.hpp b/include/boost/fusion/sequence/adapted/struct/detail/at_impl.hpp similarity index 100% rename from include/boost/fusion/adapted/struct/detail/at_impl.hpp rename to include/boost/fusion/sequence/adapted/struct/detail/at_impl.hpp diff --git a/include/boost/fusion/adapted/struct/detail/at_key_impl.hpp b/include/boost/fusion/sequence/adapted/struct/detail/at_key_impl.hpp similarity index 100% rename from include/boost/fusion/adapted/struct/detail/at_key_impl.hpp rename to include/boost/fusion/sequence/adapted/struct/detail/at_key_impl.hpp diff --git a/include/boost/fusion/adapted/struct/detail/begin_impl.hpp b/include/boost/fusion/sequence/adapted/struct/detail/begin_impl.hpp similarity index 93% rename from include/boost/fusion/adapted/struct/detail/begin_impl.hpp rename to include/boost/fusion/sequence/adapted/struct/detail/begin_impl.hpp index bf5a00bc..14817726 100644 --- a/include/boost/fusion/adapted/struct/detail/begin_impl.hpp +++ b/include/boost/fusion/sequence/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 +#include namespace boost { namespace fusion { diff --git a/include/boost/fusion/adapted/struct/detail/category_of_impl.hpp b/include/boost/fusion/sequence/adapted/struct/detail/category_of_impl.hpp similarity index 100% rename from include/boost/fusion/adapted/struct/detail/category_of_impl.hpp rename to include/boost/fusion/sequence/adapted/struct/detail/category_of_impl.hpp diff --git a/include/boost/fusion/adapted/struct/detail/end_impl.hpp b/include/boost/fusion/sequence/adapted/struct/detail/end_impl.hpp similarity index 93% rename from include/boost/fusion/adapted/struct/detail/end_impl.hpp rename to include/boost/fusion/sequence/adapted/struct/detail/end_impl.hpp index 42d7f394..91830cea 100644 --- a/include/boost/fusion/adapted/struct/detail/end_impl.hpp +++ b/include/boost/fusion/sequence/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 +#include namespace boost { namespace fusion { diff --git a/include/boost/fusion/adapted/struct/detail/has_key_impl.hpp b/include/boost/fusion/sequence/adapted/struct/detail/has_key_impl.hpp similarity index 100% rename from include/boost/fusion/adapted/struct/detail/has_key_impl.hpp rename to include/boost/fusion/sequence/adapted/struct/detail/has_key_impl.hpp diff --git a/include/boost/fusion/adapted/struct/detail/is_sequence_impl.hpp b/include/boost/fusion/sequence/adapted/struct/detail/is_sequence_impl.hpp similarity index 100% rename from include/boost/fusion/adapted/struct/detail/is_sequence_impl.hpp rename to include/boost/fusion/sequence/adapted/struct/detail/is_sequence_impl.hpp diff --git a/include/boost/fusion/adapted/struct/detail/is_view_impl.hpp b/include/boost/fusion/sequence/adapted/struct/detail/is_view_impl.hpp similarity index 100% rename from include/boost/fusion/adapted/struct/detail/is_view_impl.hpp rename to include/boost/fusion/sequence/adapted/struct/detail/is_view_impl.hpp diff --git a/include/boost/fusion/adapted/struct/detail/size_impl.hpp b/include/boost/fusion/sequence/adapted/struct/detail/size_impl.hpp similarity index 100% rename from include/boost/fusion/adapted/struct/detail/size_impl.hpp rename to include/boost/fusion/sequence/adapted/struct/detail/size_impl.hpp diff --git a/include/boost/fusion/adapted/struct/detail/value_at_impl.hpp b/include/boost/fusion/sequence/adapted/struct/detail/value_at_impl.hpp similarity index 100% rename from include/boost/fusion/adapted/struct/detail/value_at_impl.hpp rename to include/boost/fusion/sequence/adapted/struct/detail/value_at_impl.hpp diff --git a/include/boost/fusion/adapted/struct/detail/value_at_key_impl.hpp b/include/boost/fusion/sequence/adapted/struct/detail/value_at_key_impl.hpp similarity index 100% rename from include/boost/fusion/adapted/struct/detail/value_at_key_impl.hpp rename to include/boost/fusion/sequence/adapted/struct/detail/value_at_key_impl.hpp diff --git a/include/boost/fusion/adapted/struct/extension.hpp b/include/boost/fusion/sequence/adapted/struct/extension.hpp similarity index 100% rename from include/boost/fusion/adapted/struct/extension.hpp rename to include/boost/fusion/sequence/adapted/struct/extension.hpp diff --git a/include/boost/fusion/adapted/struct/struct_iterator.hpp b/include/boost/fusion/sequence/adapted/struct/struct_iterator.hpp similarity index 97% rename from include/boost/fusion/adapted/struct/struct_iterator.hpp rename to include/boost/fusion/sequence/adapted/struct/struct_iterator.hpp index caea895b..b00251bb 100644 --- a/include/boost/fusion/adapted/struct/struct_iterator.hpp +++ b/include/boost/fusion/sequence/adapted/struct/struct_iterator.hpp @@ -9,7 +9,7 @@ #define FUSION_STRUCT_ITERATOR_APRIL_2_2007_1008AM #include -#include +#include #include #include #include diff --git a/include/boost/fusion/sequence/adapted/variant.hpp b/include/boost/fusion/sequence/adapted/variant.hpp new file mode 100644 index 00000000..2443312d --- /dev/null +++ b/include/boost/fusion/sequence/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 +#include +#include +#include +#include +#include +#include +#include + +#endif diff --git a/include/boost/fusion/adapted/variant/detail/begin_impl.hpp b/include/boost/fusion/sequence/adapted/variant/detail/begin_impl.hpp similarity index 100% rename from include/boost/fusion/adapted/variant/detail/begin_impl.hpp rename to include/boost/fusion/sequence/adapted/variant/detail/begin_impl.hpp diff --git a/include/boost/fusion/adapted/variant/detail/category_of_impl.hpp b/include/boost/fusion/sequence/adapted/variant/detail/category_of_impl.hpp similarity index 100% rename from include/boost/fusion/adapted/variant/detail/category_of_impl.hpp rename to include/boost/fusion/sequence/adapted/variant/detail/category_of_impl.hpp diff --git a/include/boost/fusion/adapted/variant/detail/end_impl.hpp b/include/boost/fusion/sequence/adapted/variant/detail/end_impl.hpp similarity index 100% rename from include/boost/fusion/adapted/variant/detail/end_impl.hpp rename to include/boost/fusion/sequence/adapted/variant/detail/end_impl.hpp diff --git a/include/boost/fusion/adapted/variant/detail/is_sequence_impl.hpp b/include/boost/fusion/sequence/adapted/variant/detail/is_sequence_impl.hpp similarity index 100% rename from include/boost/fusion/adapted/variant/detail/is_sequence_impl.hpp rename to include/boost/fusion/sequence/adapted/variant/detail/is_sequence_impl.hpp diff --git a/include/boost/fusion/adapted/variant/detail/is_view_impl.hpp b/include/boost/fusion/sequence/adapted/variant/detail/is_view_impl.hpp similarity index 100% rename from include/boost/fusion/adapted/variant/detail/is_view_impl.hpp rename to include/boost/fusion/sequence/adapted/variant/detail/is_view_impl.hpp diff --git a/include/boost/fusion/adapted/variant/detail/size_impl.hpp b/include/boost/fusion/sequence/adapted/variant/detail/size_impl.hpp similarity index 100% rename from include/boost/fusion/adapted/variant/detail/size_impl.hpp rename to include/boost/fusion/sequence/adapted/variant/detail/size_impl.hpp diff --git a/include/boost/fusion/adapted/variant/tag_of.hpp b/include/boost/fusion/sequence/adapted/variant/tag_of.hpp similarity index 100% rename from include/boost/fusion/adapted/variant/tag_of.hpp rename to include/boost/fusion/sequence/adapted/variant/tag_of.hpp diff --git a/include/boost/fusion/adapted/variant/variant_iterator.hpp b/include/boost/fusion/sequence/adapted/variant/variant_iterator.hpp similarity index 100% rename from include/boost/fusion/adapted/variant/variant_iterator.hpp rename to include/boost/fusion/sequence/adapted/variant/variant_iterator.hpp diff --git a/include/boost/fusion/container.hpp b/include/boost/fusion/sequence/container.hpp similarity index 64% rename from include/boost/fusion/container.hpp rename to include/boost/fusion/sequence/container.hpp index e41c9cb3..6a1047cc 100644 --- a/include/boost/fusion/container.hpp +++ b/include/boost/fusion/sequence/container.hpp @@ -7,10 +7,10 @@ #if !defined(FUSION_SEQUENCE_CLASS_10022005_0614) #define FUSION_SEQUENCE_CLASS_10022005_0614 -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #endif diff --git a/include/boost/fusion/container/deque.hpp b/include/boost/fusion/sequence/container/deque.hpp similarity index 81% rename from include/boost/fusion/container/deque.hpp rename to include/boost/fusion/sequence/container/deque.hpp index bb29ce2f..0c9614a9 100644 --- a/include/boost/fusion/container/deque.hpp +++ b/include/boost/fusion/sequence/container/deque.hpp @@ -2,14 +2,13 @@ Copyright (c) 2001-2006 Joel de Guzman Copyright (c) 2005-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) ==============================================================================*/ #if !defined(BOOST_FUSION_SEQUENCE_CONTAINER_DEQUE_24112006_2036) #define BOOST_FUSION_SEQUENCE_CONTAINER_DEQUE_24112006_2036 -#include -#include +#include #endif diff --git a/include/boost/fusion/container/deque/back_extended_deque.hpp b/include/boost/fusion/sequence/container/deque/back_extended_deque.hpp similarity index 95% rename from include/boost/fusion/container/deque/back_extended_deque.hpp rename to include/boost/fusion/sequence/container/deque/back_extended_deque.hpp index 28d5ceca..6310bb59 100644 --- a/include/boost/fusion/container/deque/back_extended_deque.hpp +++ b/include/boost/fusion/sequence/container/deque/back_extended_deque.hpp @@ -8,7 +8,7 @@ #if !defined(BOOST_FUSION_BACK_EXTENDED_DEQUE_26112006_2209) #define BOOST_FUSION_BACK_EXTENDED_DEQUE_26112006_2209 -#include +#include #include #include #include diff --git a/include/boost/fusion/container/deque/deque.hpp b/include/boost/fusion/sequence/container/deque/deque.hpp similarity index 77% rename from include/boost/fusion/container/deque/deque.hpp rename to include/boost/fusion/sequence/container/deque/deque.hpp index 27d9ce78..884899f8 100644 --- a/include/boost/fusion/container/deque/deque.hpp +++ b/include/boost/fusion/sequence/container/deque/deque.hpp @@ -8,13 +8,13 @@ #if !defined(BOOST_FUSION_DEQUE_26112006_1649) #define BOOST_FUSION_DEQUE_26112006_1649 -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include -#include +#include #include #include #include @@ -22,11 +22,11 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include @@ -52,7 +52,7 @@ namespace boost { namespace fusion { mpl::if_ >, mpl::int_<0>, mpl::int_<-1> >::type::value> next_down; typedef mpl::false_ is_view; -#include +#include deque() {} diff --git a/include/boost/fusion/container/deque/deque_fwd.hpp b/include/boost/fusion/sequence/container/deque/deque_fwd.hpp similarity index 92% rename from include/boost/fusion/container/deque/deque_fwd.hpp rename to include/boost/fusion/sequence/container/deque/deque_fwd.hpp index 415bb2f2..ce47bf62 100644 --- a/include/boost/fusion/container/deque/deque_fwd.hpp +++ b/include/boost/fusion/sequence/container/deque/deque_fwd.hpp @@ -8,7 +8,7 @@ #if !defined(FUSION_DEQUE_FORWARD_02092007_0749) #define FUSION_DEQUE_FORWARD_02092007_0749 -#include +#include #include namespace boost { namespace fusion diff --git a/include/boost/fusion/container/deque/deque_iterator.hpp b/include/boost/fusion/sequence/container/deque/deque_iterator.hpp similarity index 97% rename from include/boost/fusion/container/deque/deque_iterator.hpp rename to include/boost/fusion/sequence/container/deque/deque_iterator.hpp index 90c68918..8fb6f009 100644 --- a/include/boost/fusion/container/deque/deque_iterator.hpp +++ b/include/boost/fusion/sequence/container/deque/deque_iterator.hpp @@ -9,7 +9,7 @@ #define BOOST_FUSION_DEQUE_ITERATOR_26112006_2154 #include -#include +#include #include #include diff --git a/include/boost/fusion/container/deque/detail/at_impl.hpp b/include/boost/fusion/sequence/container/deque/detail/at_impl.hpp similarity index 96% rename from include/boost/fusion/container/deque/detail/at_impl.hpp rename to include/boost/fusion/sequence/container/deque/detail/at_impl.hpp index 3dc7cde9..7edf37f1 100644 --- a/include/boost/fusion/container/deque/detail/at_impl.hpp +++ b/include/boost/fusion/sequence/container/deque/detail/at_impl.hpp @@ -8,7 +8,7 @@ #if !defined(BOOST_FUSION_DEQUE_AT_IMPL_09122006_2017) #define BOOST_FUSION_DEQUE_AT_IMPL_09122006_2017 -#include +#include #include #include diff --git a/include/boost/fusion/container/deque/detail/begin_impl.hpp b/include/boost/fusion/sequence/container/deque/detail/begin_impl.hpp similarity index 95% rename from include/boost/fusion/container/deque/detail/begin_impl.hpp rename to include/boost/fusion/sequence/container/deque/detail/begin_impl.hpp index 13b50143..867cab8e 100644 --- a/include/boost/fusion/container/deque/detail/begin_impl.hpp +++ b/include/boost/fusion/sequence/container/deque/detail/begin_impl.hpp @@ -8,7 +8,7 @@ #if !defined(BOOST_FUSION_DEQUE_BEGIN_IMPL_09122006_2034) #define BOOST_FUSION_DEQUE_BEGIN_IMPL_09122006_2034 -#include +#include #include #include diff --git a/include/boost/fusion/container/deque/detail/deque_forward_ctor.hpp b/include/boost/fusion/sequence/container/deque/detail/deque_forward_ctor.hpp similarity index 93% rename from include/boost/fusion/container/deque/detail/deque_forward_ctor.hpp rename to include/boost/fusion/sequence/container/deque/detail/deque_forward_ctor.hpp index 813c0491..f79a02e5 100644 --- a/include/boost/fusion/container/deque/detail/deque_forward_ctor.hpp +++ b/include/boost/fusion/sequence/container/deque/detail/deque_forward_ctor.hpp @@ -14,7 +14,7 @@ #include #define BOOST_PP_FILENAME_1 \ - + #define BOOST_PP_ITERATION_LIMITS (2, FUSION_MAX_DEQUE_SIZE) #include BOOST_PP_ITERATE() diff --git a/include/boost/fusion/container/deque/detail/deque_initial_size.hpp b/include/boost/fusion/sequence/container/deque/detail/deque_initial_size.hpp similarity index 100% rename from include/boost/fusion/container/deque/detail/deque_initial_size.hpp rename to include/boost/fusion/sequence/container/deque/detail/deque_initial_size.hpp diff --git a/include/boost/fusion/container/deque/detail/deque_keyed_values.hpp b/include/boost/fusion/sequence/container/deque/detail/deque_keyed_values.hpp similarity index 91% rename from include/boost/fusion/container/deque/detail/deque_keyed_values.hpp rename to include/boost/fusion/sequence/container/deque/detail/deque_keyed_values.hpp index 11b229b2..26a76512 100644 --- a/include/boost/fusion/container/deque/detail/deque_keyed_values.hpp +++ b/include/boost/fusion/sequence/container/deque/detail/deque_keyed_values.hpp @@ -8,8 +8,8 @@ #if !defined(BOOST_FUSION_DEQUE_DETAIL_DEQUE_KEYED_VALUES_26112006_1330) #define BOOST_FUSION_DEQUE_DETAIL_DEQUE_KEYED_VALUES_26112006_1330 -#include -#include +#include +#include #include #include @@ -59,7 +59,7 @@ namespace detail { BOOST_PP_ENUM_SHIFTED_PARAMS(FUSION_MAX_DEQUE_SIZE, T)>::type tail; typedef keyed_element type; -#include +#include }; diff --git a/include/boost/fusion/container/deque/detail/deque_keyed_values_call.hpp b/include/boost/fusion/sequence/container/deque/detail/deque_keyed_values_call.hpp similarity index 94% rename from include/boost/fusion/container/deque/detail/deque_keyed_values_call.hpp rename to include/boost/fusion/sequence/container/deque/detail/deque_keyed_values_call.hpp index 0a39add6..ab31c43c 100644 --- a/include/boost/fusion/container/deque/detail/deque_keyed_values_call.hpp +++ b/include/boost/fusion/sequence/container/deque/detail/deque_keyed_values_call.hpp @@ -14,7 +14,7 @@ #include #define BOOST_PP_FILENAME_1 \ - + #define BOOST_PP_ITERATION_LIMITS (1, FUSION_MAX_DEQUE_SIZE) #include BOOST_PP_ITERATE() diff --git a/include/boost/fusion/container/deque/detail/end_impl.hpp b/include/boost/fusion/sequence/container/deque/detail/end_impl.hpp similarity index 95% rename from include/boost/fusion/container/deque/detail/end_impl.hpp rename to include/boost/fusion/sequence/container/deque/detail/end_impl.hpp index 96a1b17d..505dfdac 100644 --- a/include/boost/fusion/container/deque/detail/end_impl.hpp +++ b/include/boost/fusion/sequence/container/deque/detail/end_impl.hpp @@ -8,7 +8,7 @@ #if !defined(BOOST_FUSION_DEQUE_END_IMPL_09122006_2034) #define BOOST_FUSION_DEQUE_END_IMPL_09122006_2034 -#include +#include #include #include diff --git a/include/boost/fusion/container/deque/detail/keyed_element.hpp b/include/boost/fusion/sequence/container/deque/detail/keyed_element.hpp similarity index 100% rename from include/boost/fusion/container/deque/detail/keyed_element.hpp rename to include/boost/fusion/sequence/container/deque/detail/keyed_element.hpp diff --git a/include/boost/fusion/container/deque/detail/value_at_impl.hpp b/include/boost/fusion/sequence/container/deque/detail/value_at_impl.hpp similarity index 95% rename from include/boost/fusion/container/deque/detail/value_at_impl.hpp rename to include/boost/fusion/sequence/container/deque/detail/value_at_impl.hpp index ec0351de..6c08231d 100644 --- a/include/boost/fusion/container/deque/detail/value_at_impl.hpp +++ b/include/boost/fusion/sequence/container/deque/detail/value_at_impl.hpp @@ -8,7 +8,7 @@ #if !defined(BOOST_FUSION_DEQUE_VALUE_AT_IMPL_08122006_0756) #define BOOST_FUSION_DEQUE_VALUE_AT_IMPL_08122006_0756 -#include +#include #include #include diff --git a/include/boost/fusion/container/deque/front_extended_deque.hpp b/include/boost/fusion/sequence/container/deque/front_extended_deque.hpp similarity index 95% rename from include/boost/fusion/container/deque/front_extended_deque.hpp rename to include/boost/fusion/sequence/container/deque/front_extended_deque.hpp index 156e66a4..b52508e7 100644 --- a/include/boost/fusion/container/deque/front_extended_deque.hpp +++ b/include/boost/fusion/sequence/container/deque/front_extended_deque.hpp @@ -8,7 +8,7 @@ #if !defined(BOOST_FUSION_FRONT_EXTENDED_DEQUE_26112006_2209) #define BOOST_FUSION_FRONT_EXTENDED_DEQUE_26112006_2209 -#include +#include #include #include #include diff --git a/include/boost/fusion/container/deque/limits.hpp b/include/boost/fusion/sequence/container/deque/limits.hpp similarity index 100% rename from include/boost/fusion/container/deque/limits.hpp rename to include/boost/fusion/sequence/container/deque/limits.hpp diff --git a/include/boost/fusion/container/ext_/tree.hpp b/include/boost/fusion/sequence/container/ext_/tree.hpp similarity index 93% rename from include/boost/fusion/container/ext_/tree.hpp rename to include/boost/fusion/sequence/container/ext_/tree.hpp index cd8c5dcd..c6edc28c 100755 --- a/include/boost/fusion/container/ext_/tree.hpp +++ b/include/boost/fusion/sequence/container/ext_/tree.hpp @@ -14,13 +14,13 @@ #include #include #include -#include -#include // for nil -#include +#include +#include // for nil +#include #include #include #include -#include +#include namespace boost { namespace fusion { diff --git a/include/boost/fusion/container/list.hpp b/include/boost/fusion/sequence/container/list.hpp similarity index 58% rename from include/boost/fusion/container/list.hpp rename to include/boost/fusion/sequence/container/list.hpp index 8a0d6456..47024b9c 100644 --- a/include/boost/fusion/container/list.hpp +++ b/include/boost/fusion/sequence/container/list.hpp @@ -1,17 +1,16 @@ /*============================================================================= 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_SEQUENCE_CLASS_LIST_10022005_0605) #define FUSION_SEQUENCE_CLASS_LIST_10022005_0605 -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #endif diff --git a/include/boost/fusion/container/list/cons.hpp b/include/boost/fusion/sequence/container/list/cons.hpp similarity index 91% rename from include/boost/fusion/container/list/cons.hpp rename to include/boost/fusion/sequence/container/list/cons.hpp index 8e500f66..877f2982 100644 --- a/include/boost/fusion/container/list/cons.hpp +++ b/include/boost/fusion/sequence/container/list/cons.hpp @@ -13,12 +13,12 @@ #include #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include #include diff --git a/include/boost/fusion/container/list/cons_iterator.hpp b/include/boost/fusion/sequence/container/list/cons_iterator.hpp similarity index 86% rename from include/boost/fusion/container/list/cons_iterator.hpp rename to include/boost/fusion/sequence/container/list/cons_iterator.hpp index 7ef034e3..6455f04f 100644 --- a/include/boost/fusion/container/list/cons_iterator.hpp +++ b/include/boost/fusion/sequence/container/list/cons_iterator.hpp @@ -10,11 +10,11 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include namespace boost { namespace fusion { diff --git a/include/boost/fusion/container/list/detail/at_impl.hpp b/include/boost/fusion/sequence/container/list/detail/at_impl.hpp similarity index 100% rename from include/boost/fusion/container/list/detail/at_impl.hpp rename to include/boost/fusion/sequence/container/list/detail/at_impl.hpp diff --git a/include/boost/fusion/container/list/detail/begin_impl.hpp b/include/boost/fusion/sequence/container/list/detail/begin_impl.hpp similarity index 100% rename from include/boost/fusion/container/list/detail/begin_impl.hpp rename to include/boost/fusion/sequence/container/list/detail/begin_impl.hpp diff --git a/include/boost/fusion/container/list/detail/deref_impl.hpp b/include/boost/fusion/sequence/container/list/detail/deref_impl.hpp similarity index 100% rename from include/boost/fusion/container/list/detail/deref_impl.hpp rename to include/boost/fusion/sequence/container/list/detail/deref_impl.hpp diff --git a/include/boost/fusion/container/list/detail/empty_impl.hpp b/include/boost/fusion/sequence/container/list/detail/empty_impl.hpp similarity index 100% rename from include/boost/fusion/container/list/detail/empty_impl.hpp rename to include/boost/fusion/sequence/container/list/detail/empty_impl.hpp diff --git a/include/boost/fusion/container/list/detail/end_impl.hpp b/include/boost/fusion/sequence/container/list/detail/end_impl.hpp similarity index 100% rename from include/boost/fusion/container/list/detail/end_impl.hpp rename to include/boost/fusion/sequence/container/list/detail/end_impl.hpp diff --git a/include/boost/fusion/container/list/detail/equal_to_impl.hpp b/include/boost/fusion/sequence/container/list/detail/equal_to_impl.hpp similarity index 100% rename from include/boost/fusion/container/list/detail/equal_to_impl.hpp rename to include/boost/fusion/sequence/container/list/detail/equal_to_impl.hpp diff --git a/include/boost/fusion/container/list/detail/list_forward_ctor.hpp b/include/boost/fusion/sequence/container/list/detail/list_forward_ctor.hpp similarity index 95% rename from include/boost/fusion/container/list/detail/list_forward_ctor.hpp rename to include/boost/fusion/sequence/container/list/detail/list_forward_ctor.hpp index 39471809..7922f382 100644 --- a/include/boost/fusion/container/list/detail/list_forward_ctor.hpp +++ b/include/boost/fusion/sequence/container/list/detail/list_forward_ctor.hpp @@ -18,7 +18,7 @@ #define FUSION_LIST_CL_PAREN(z, n, type) ) #define BOOST_PP_FILENAME_1 \ - + #define BOOST_PP_ITERATION_LIMITS (1, FUSION_MAX_LIST_SIZE) #include BOOST_PP_ITERATE() diff --git a/include/boost/fusion/container/list/detail/list_to_cons.hpp b/include/boost/fusion/sequence/container/list/detail/list_to_cons.hpp similarity index 87% rename from include/boost/fusion/container/list/detail/list_to_cons.hpp rename to include/boost/fusion/sequence/container/list/detail/list_to_cons.hpp index 8e6d6912..fa5c7bb9 100644 --- a/include/boost/fusion/container/list/detail/list_to_cons.hpp +++ b/include/boost/fusion/sequence/container/list/detail/list_to_cons.hpp @@ -7,8 +7,8 @@ #if !defined(FUSION_LIST_TO_CONS_07172005_1041) #define FUSION_LIST_TO_CONS_07172005_1041 -#include -#include +#include +#include #include #include #include @@ -35,7 +35,7 @@ namespace boost { namespace fusion { namespace detail typedef cons type; - #include + #include }; template <> diff --git a/include/boost/fusion/container/list/detail/list_to_cons_call.hpp b/include/boost/fusion/sequence/container/list/detail/list_to_cons_call.hpp similarity index 95% rename from include/boost/fusion/container/list/detail/list_to_cons_call.hpp rename to include/boost/fusion/sequence/container/list/detail/list_to_cons_call.hpp index 069f0598..c8e63e95 100644 --- a/include/boost/fusion/container/list/detail/list_to_cons_call.hpp +++ b/include/boost/fusion/sequence/container/list/detail/list_to_cons_call.hpp @@ -13,7 +13,7 @@ #include #define BOOST_PP_FILENAME_1 \ - + #define BOOST_PP_ITERATION_LIMITS (1, FUSION_MAX_LIST_SIZE) #include BOOST_PP_ITERATE() diff --git a/include/boost/fusion/container/list/detail/next_impl.hpp b/include/boost/fusion/sequence/container/list/detail/next_impl.hpp similarity index 100% rename from include/boost/fusion/container/list/detail/next_impl.hpp rename to include/boost/fusion/sequence/container/list/detail/next_impl.hpp diff --git a/include/boost/fusion/container/list/detail/value_at_impl.hpp b/include/boost/fusion/sequence/container/list/detail/value_at_impl.hpp similarity index 100% rename from include/boost/fusion/container/list/detail/value_at_impl.hpp rename to include/boost/fusion/sequence/container/list/detail/value_at_impl.hpp diff --git a/include/boost/fusion/container/list/detail/value_of_impl.hpp b/include/boost/fusion/sequence/container/list/detail/value_of_impl.hpp similarity index 100% rename from include/boost/fusion/container/list/detail/value_of_impl.hpp rename to include/boost/fusion/sequence/container/list/detail/value_of_impl.hpp diff --git a/include/boost/fusion/container/list/limits.hpp b/include/boost/fusion/sequence/container/list/limits.hpp similarity index 100% rename from include/boost/fusion/container/list/limits.hpp rename to include/boost/fusion/sequence/container/list/limits.hpp diff --git a/include/boost/fusion/container/list/list.hpp b/include/boost/fusion/sequence/container/list/list.hpp similarity index 90% rename from include/boost/fusion/container/list/list.hpp rename to include/boost/fusion/sequence/container/list/list.hpp index 7516df48..e34e648f 100644 --- a/include/boost/fusion/container/list/list.hpp +++ b/include/boost/fusion/sequence/container/list/list.hpp @@ -7,8 +7,8 @@ #if !defined(FUSION_LIST_07172005_1153) #define FUSION_LIST_07172005_1153 -#include -#include +#include +#include namespace boost { namespace fusion { @@ -45,7 +45,7 @@ namespace boost { namespace fusion // typename detail::call_param::type _0 // , typename detail::call_param::type _1) // : inherited_type(list_to_cons::call(_0, _1)) {} - #include + #include template list& diff --git a/include/boost/fusion/container/list/list_fwd.hpp b/include/boost/fusion/sequence/container/list/list_fwd.hpp similarity index 92% rename from include/boost/fusion/container/list/list_fwd.hpp rename to include/boost/fusion/sequence/container/list/list_fwd.hpp index 90c088b4..cfd4e370 100644 --- a/include/boost/fusion/container/list/list_fwd.hpp +++ b/include/boost/fusion/sequence/container/list/list_fwd.hpp @@ -7,7 +7,7 @@ #if !defined(FUSION_LIST_FORWARD_07172005_0224) #define FUSION_LIST_FORWARD_07172005_0224 -#include +#include #include namespace boost { namespace fusion diff --git a/include/boost/fusion/container/map.hpp b/include/boost/fusion/sequence/container/map.hpp similarity index 68% rename from include/boost/fusion/container/map.hpp rename to include/boost/fusion/sequence/container/map.hpp index 69518311..100905cf 100644 --- a/include/boost/fusion/container/map.hpp +++ b/include/boost/fusion/sequence/container/map.hpp @@ -1,15 +1,14 @@ /*============================================================================= 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_SEQUENCE_CLASS_MAP_10022005_0606) #define FUSION_SEQUENCE_CLASS_MAP_10022005_0606 -#include -#include -#include -#include +#include +#include +#include #endif diff --git a/include/boost/fusion/container/map/detail/at_key_impl.hpp b/include/boost/fusion/sequence/container/map/detail/at_key_impl.hpp similarity index 100% rename from include/boost/fusion/container/map/detail/at_key_impl.hpp rename to include/boost/fusion/sequence/container/map/detail/at_key_impl.hpp diff --git a/include/boost/fusion/container/map/detail/begin_impl.hpp b/include/boost/fusion/sequence/container/map/detail/begin_impl.hpp similarity index 100% rename from include/boost/fusion/container/map/detail/begin_impl.hpp rename to include/boost/fusion/sequence/container/map/detail/begin_impl.hpp diff --git a/include/boost/fusion/container/map/detail/end_impl.hpp b/include/boost/fusion/sequence/container/map/detail/end_impl.hpp similarity index 100% rename from include/boost/fusion/container/map/detail/end_impl.hpp rename to include/boost/fusion/sequence/container/map/detail/end_impl.hpp diff --git a/include/boost/fusion/container/map/detail/lookup_key.hpp b/include/boost/fusion/sequence/container/map/detail/lookup_key.hpp similarity index 100% rename from include/boost/fusion/container/map/detail/lookup_key.hpp rename to include/boost/fusion/sequence/container/map/detail/lookup_key.hpp diff --git a/include/boost/fusion/container/map/detail/map_forward_ctor.hpp b/include/boost/fusion/sequence/container/map/detail/map_forward_ctor.hpp similarity index 94% rename from include/boost/fusion/container/map/detail/map_forward_ctor.hpp rename to include/boost/fusion/sequence/container/map/detail/map_forward_ctor.hpp index c35168ba..34b81830 100644 --- a/include/boost/fusion/container/map/detail/map_forward_ctor.hpp +++ b/include/boost/fusion/sequence/container/map/detail/map_forward_ctor.hpp @@ -13,7 +13,7 @@ #include #define BOOST_PP_FILENAME_1 \ - + #define BOOST_PP_ITERATION_LIMITS (1, FUSION_MAX_MAP_SIZE) #include BOOST_PP_ITERATE() diff --git a/include/boost/fusion/container/map/detail/map_lookup.hpp b/include/boost/fusion/sequence/container/map/detail/map_lookup.hpp similarity index 98% rename from include/boost/fusion/container/map/detail/map_lookup.hpp rename to include/boost/fusion/sequence/container/map/detail/map_lookup.hpp index 2f792cbd..aef42c62 100644 --- a/include/boost/fusion/container/map/detail/map_lookup.hpp +++ b/include/boost/fusion/sequence/container/map/detail/map_lookup.hpp @@ -52,14 +52,10 @@ } #define BOOST_PP_FILENAME_1 \ - + #define BOOST_PP_ITERATION_LIMITS (0, BOOST_PP_DEC(FUSION_MAX_MAP_SIZE)) #include BOOST_PP_ITERATE() -#if defined(BOOST_MSVC) && (BOOST_MSVC == 1310) -#pragma warning (pop) -#endif - #endif #else // defined(BOOST_PP_IS_ITERATING) /////////////////////////////////////////////////////////////////////////////// @@ -124,5 +120,10 @@ } #undef N + +#if defined(BOOST_MSVC) && (BOOST_MSVC == 1310) +#pragma warning (pop) +#endif + #endif // defined(BOOST_PP_IS_ITERATING) diff --git a/include/boost/fusion/container/map/detail/value_at_key_impl.hpp b/include/boost/fusion/sequence/container/map/detail/value_at_key_impl.hpp similarity index 100% rename from include/boost/fusion/container/map/detail/value_at_key_impl.hpp rename to include/boost/fusion/sequence/container/map/detail/value_at_key_impl.hpp diff --git a/include/boost/fusion/container/map/limits.hpp b/include/boost/fusion/sequence/container/map/limits.hpp similarity index 92% rename from include/boost/fusion/container/map/limits.hpp rename to include/boost/fusion/sequence/container/map/limits.hpp index 738abff4..33cbc832 100644 --- a/include/boost/fusion/container/map/limits.hpp +++ b/include/boost/fusion/sequence/container/map/limits.hpp @@ -7,7 +7,7 @@ #if !defined(FUSION_MAP_LIMITS_07212005_1104) #define FUSION_MAP_LIMITS_07212005_1104 -#include +#include #if !defined(FUSION_MAX_MAP_SIZE) # define FUSION_MAX_MAP_SIZE FUSION_MAX_VECTOR_SIZE diff --git a/include/boost/fusion/container/map/map.hpp b/include/boost/fusion/sequence/container/map/map.hpp similarity index 73% rename from include/boost/fusion/container/map/map.hpp rename to include/boost/fusion/sequence/container/map/map.hpp index 5f5fb1cc..bf6a0fa8 100644 --- a/include/boost/fusion/container/map/map.hpp +++ b/include/boost/fusion/sequence/container/map/map.hpp @@ -10,13 +10,13 @@ #include #include #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -48,8 +48,8 @@ namespace boost { namespace fusion map(Sequence const& rhs) : data(rhs) {} - #include - #include + #include + #include template map& diff --git a/include/boost/fusion/container/map/map_fwd.hpp b/include/boost/fusion/sequence/container/map/map_fwd.hpp similarity index 92% rename from include/boost/fusion/container/map/map_fwd.hpp rename to include/boost/fusion/sequence/container/map/map_fwd.hpp index 660466bd..311dce5a 100644 --- a/include/boost/fusion/container/map/map_fwd.hpp +++ b/include/boost/fusion/sequence/container/map/map_fwd.hpp @@ -7,7 +7,7 @@ #if !defined(FUSION_MAP_FORWARD_07212005_1105) #define FUSION_MAP_FORWARD_07212005_1105 -#include +#include #include namespace boost { namespace fusion diff --git a/include/boost/fusion/container/set.hpp b/include/boost/fusion/sequence/container/set.hpp similarity index 68% rename from include/boost/fusion/container/set.hpp rename to include/boost/fusion/sequence/container/set.hpp index 6b7674d6..24ec2c67 100644 --- a/include/boost/fusion/container/set.hpp +++ b/include/boost/fusion/sequence/container/set.hpp @@ -1,15 +1,14 @@ /*============================================================================= 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_SEQUENCE_CLASS_SET_10022005_0607) #define FUSION_SEQUENCE_CLASS_SET_10022005_0607 -#include -#include -#include -#include +#include +#include +#include #endif diff --git a/include/boost/fusion/container/set/detail/at_key_impl.hpp b/include/boost/fusion/sequence/container/set/detail/at_key_impl.hpp similarity index 100% rename from include/boost/fusion/container/set/detail/at_key_impl.hpp rename to include/boost/fusion/sequence/container/set/detail/at_key_impl.hpp diff --git a/include/boost/fusion/container/set/detail/begin_impl.hpp b/include/boost/fusion/sequence/container/set/detail/begin_impl.hpp similarity index 100% rename from include/boost/fusion/container/set/detail/begin_impl.hpp rename to include/boost/fusion/sequence/container/set/detail/begin_impl.hpp diff --git a/include/boost/fusion/container/set/detail/end_impl.hpp b/include/boost/fusion/sequence/container/set/detail/end_impl.hpp similarity index 100% rename from include/boost/fusion/container/set/detail/end_impl.hpp rename to include/boost/fusion/sequence/container/set/detail/end_impl.hpp diff --git a/include/boost/fusion/container/set/detail/lookup_key.hpp b/include/boost/fusion/sequence/container/set/detail/lookup_key.hpp similarity index 100% rename from include/boost/fusion/container/set/detail/lookup_key.hpp rename to include/boost/fusion/sequence/container/set/detail/lookup_key.hpp diff --git a/include/boost/fusion/container/set/detail/set_forward_ctor.hpp b/include/boost/fusion/sequence/container/set/detail/set_forward_ctor.hpp similarity index 94% rename from include/boost/fusion/container/set/detail/set_forward_ctor.hpp rename to include/boost/fusion/sequence/container/set/detail/set_forward_ctor.hpp index d105b150..6eddd650 100644 --- a/include/boost/fusion/container/set/detail/set_forward_ctor.hpp +++ b/include/boost/fusion/sequence/container/set/detail/set_forward_ctor.hpp @@ -13,7 +13,7 @@ #include #define BOOST_PP_FILENAME_1 \ - + #define BOOST_PP_ITERATION_LIMITS (1, FUSION_MAX_SET_SIZE) #include BOOST_PP_ITERATE() diff --git a/include/boost/fusion/container/set/detail/set_lookup.hpp b/include/boost/fusion/sequence/container/set/detail/set_lookup.hpp similarity index 98% rename from include/boost/fusion/container/set/detail/set_lookup.hpp rename to include/boost/fusion/sequence/container/set/detail/set_lookup.hpp index 6df4b401..fd300457 100644 --- a/include/boost/fusion/container/set/detail/set_lookup.hpp +++ b/include/boost/fusion/sequence/container/set/detail/set_lookup.hpp @@ -52,14 +52,10 @@ } #define BOOST_PP_FILENAME_1 \ - + #define BOOST_PP_ITERATION_LIMITS (0, BOOST_PP_DEC(FUSION_MAX_SET_SIZE)) #include BOOST_PP_ITERATE() -#if defined(BOOST_MSVC) && (BOOST_MSVC == 1310) -#pragma warning (pop) -#endif - #endif #else // defined(BOOST_PP_IS_ITERATING) /////////////////////////////////////////////////////////////////////////////// @@ -124,5 +120,10 @@ } #undef N + +#if defined(BOOST_MSVC) && (BOOST_MSVC == 1310) +#pragma warning (pop) +#endif + #endif // defined(BOOST_PP_IS_ITERATING) diff --git a/include/boost/fusion/container/set/detail/value_at_key_impl.hpp b/include/boost/fusion/sequence/container/set/detail/value_at_key_impl.hpp similarity index 100% rename from include/boost/fusion/container/set/detail/value_at_key_impl.hpp rename to include/boost/fusion/sequence/container/set/detail/value_at_key_impl.hpp diff --git a/include/boost/fusion/container/set/limits.hpp b/include/boost/fusion/sequence/container/set/limits.hpp similarity index 92% rename from include/boost/fusion/container/set/limits.hpp rename to include/boost/fusion/sequence/container/set/limits.hpp index 35eb0803..0b03b4dc 100644 --- a/include/boost/fusion/container/set/limits.hpp +++ b/include/boost/fusion/sequence/container/set/limits.hpp @@ -7,7 +7,7 @@ #if !defined(FUSION_SET_LIMITS_09162005_1103) #define FUSION_SET_LIMITS_09162005_1103 -#include +#include #if !defined(FUSION_MAX_SET_SIZE) # define FUSION_MAX_SET_SIZE FUSION_MAX_VECTOR_SIZE diff --git a/include/boost/fusion/container/set/set.hpp b/include/boost/fusion/sequence/container/set/set.hpp similarity index 73% rename from include/boost/fusion/container/set/set.hpp rename to include/boost/fusion/sequence/container/set/set.hpp index 07580bb6..f5e7f152 100644 --- a/include/boost/fusion/container/set/set.hpp +++ b/include/boost/fusion/sequence/container/set/set.hpp @@ -10,13 +10,13 @@ #include #include #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -48,8 +48,8 @@ namespace boost { namespace fusion set(Sequence const& rhs) : data(rhs) {} - #include - #include + #include + #include template set& diff --git a/include/boost/fusion/container/set/set_fwd.hpp b/include/boost/fusion/sequence/container/set/set_fwd.hpp similarity index 92% rename from include/boost/fusion/container/set/set_fwd.hpp rename to include/boost/fusion/sequence/container/set/set_fwd.hpp index 7facb513..38ca9d22 100644 --- a/include/boost/fusion/container/set/set_fwd.hpp +++ b/include/boost/fusion/sequence/container/set/set_fwd.hpp @@ -7,7 +7,7 @@ #if !defined(FUSION_SET_FORWARD_09162005_1102) #define FUSION_SET_FORWARD_09162005_1102 -#include +#include #include namespace boost { namespace fusion diff --git a/include/boost/fusion/sequence/container/vector.hpp b/include/boost/fusion/sequence/container/vector.hpp new file mode 100644 index 00000000..dd7f4333 --- /dev/null +++ b/include/boost/fusion/sequence/container/vector.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(FUSION_SEQUENCE_CLASS_VECTOR_10022005_0602) +#define FUSION_SEQUENCE_CLASS_VECTOR_10022005_0602 + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#endif diff --git a/include/boost/fusion/container/vector/detail/advance_impl.hpp b/include/boost/fusion/sequence/container/vector/detail/advance_impl.hpp similarity index 100% rename from include/boost/fusion/container/vector/detail/advance_impl.hpp rename to include/boost/fusion/sequence/container/vector/detail/advance_impl.hpp diff --git a/include/boost/fusion/container/vector/detail/at_impl.hpp b/include/boost/fusion/sequence/container/vector/detail/at_impl.hpp similarity index 100% rename from include/boost/fusion/container/vector/detail/at_impl.hpp rename to include/boost/fusion/sequence/container/vector/detail/at_impl.hpp diff --git a/include/boost/fusion/container/vector/detail/begin_impl.hpp b/include/boost/fusion/sequence/container/vector/detail/begin_impl.hpp similarity index 93% rename from include/boost/fusion/container/vector/detail/begin_impl.hpp rename to include/boost/fusion/sequence/container/vector/detail/begin_impl.hpp index d2d687be..31d5643c 100644 --- a/include/boost/fusion/container/vector/detail/begin_impl.hpp +++ b/include/boost/fusion/sequence/container/vector/detail/begin_impl.hpp @@ -7,7 +7,7 @@ #if !defined(FUSION_BEGIN_IMPL_05042005_1136) #define FUSION_BEGIN_IMPL_05042005_1136 -#include +#include namespace boost { namespace fusion { diff --git a/include/boost/fusion/container/vector/detail/deref_impl.hpp b/include/boost/fusion/sequence/container/vector/detail/deref_impl.hpp similarity index 100% rename from include/boost/fusion/container/vector/detail/deref_impl.hpp rename to include/boost/fusion/sequence/container/vector/detail/deref_impl.hpp diff --git a/include/boost/fusion/container/vector/detail/distance_impl.hpp b/include/boost/fusion/sequence/container/vector/detail/distance_impl.hpp similarity index 100% rename from include/boost/fusion/container/vector/detail/distance_impl.hpp rename to include/boost/fusion/sequence/container/vector/detail/distance_impl.hpp diff --git a/include/boost/fusion/container/vector/detail/end_impl.hpp b/include/boost/fusion/sequence/container/vector/detail/end_impl.hpp similarity index 93% rename from include/boost/fusion/container/vector/detail/end_impl.hpp rename to include/boost/fusion/sequence/container/vector/detail/end_impl.hpp index f33282dc..795cabaa 100644 --- a/include/boost/fusion/container/vector/detail/end_impl.hpp +++ b/include/boost/fusion/sequence/container/vector/detail/end_impl.hpp @@ -7,7 +7,7 @@ #if !defined(FUSION_END_IMPL_05042005_1142) #define FUSION_END_IMPL_05042005_1142 -#include +#include namespace boost { namespace fusion { diff --git a/include/boost/fusion/container/vector/detail/equal_to_impl.hpp b/include/boost/fusion/sequence/container/vector/detail/equal_to_impl.hpp similarity index 100% rename from include/boost/fusion/container/vector/detail/equal_to_impl.hpp rename to include/boost/fusion/sequence/container/vector/detail/equal_to_impl.hpp diff --git a/include/boost/fusion/container/vector/detail/next_impl.hpp b/include/boost/fusion/sequence/container/vector/detail/next_impl.hpp similarity index 94% rename from include/boost/fusion/container/vector/detail/next_impl.hpp rename to include/boost/fusion/sequence/container/vector/detail/next_impl.hpp index b11cfdb2..1bbe16f1 100644 --- a/include/boost/fusion/container/vector/detail/next_impl.hpp +++ b/include/boost/fusion/sequence/container/vector/detail/next_impl.hpp @@ -7,7 +7,7 @@ #if !defined(FUSION_NEXT_IMPL_05042005_1058) #define FUSION_NEXT_IMPL_05042005_1058 -#include +#include namespace boost { namespace fusion { diff --git a/include/boost/fusion/container/vector/detail/prior_impl.hpp b/include/boost/fusion/sequence/container/vector/detail/prior_impl.hpp similarity index 94% rename from include/boost/fusion/container/vector/detail/prior_impl.hpp rename to include/boost/fusion/sequence/container/vector/detail/prior_impl.hpp index 610591b6..3caaa590 100644 --- a/include/boost/fusion/container/vector/detail/prior_impl.hpp +++ b/include/boost/fusion/sequence/container/vector/detail/prior_impl.hpp @@ -7,7 +7,7 @@ #if !defined(FUSION_PRIOR_IMPL_05042005_1145) #define FUSION_PRIOR_IMPL_05042005_1145 -#include +#include namespace boost { namespace fusion { diff --git a/include/boost/fusion/container/vector/detail/value_at_impl.hpp b/include/boost/fusion/sequence/container/vector/detail/value_at_impl.hpp similarity index 100% rename from include/boost/fusion/container/vector/detail/value_at_impl.hpp rename to include/boost/fusion/sequence/container/vector/detail/value_at_impl.hpp diff --git a/include/boost/fusion/container/vector/detail/value_of_impl.hpp b/include/boost/fusion/sequence/container/vector/detail/value_of_impl.hpp similarity index 100% rename from include/boost/fusion/container/vector/detail/value_of_impl.hpp rename to include/boost/fusion/sequence/container/vector/detail/value_of_impl.hpp diff --git a/include/boost/fusion/container/vector/detail/vector_forward_ctor.hpp b/include/boost/fusion/sequence/container/vector/detail/vector_forward_ctor.hpp similarity index 94% rename from include/boost/fusion/container/vector/detail/vector_forward_ctor.hpp rename to include/boost/fusion/sequence/container/vector/detail/vector_forward_ctor.hpp index e4680bb8..0dadc05d 100644 --- a/include/boost/fusion/container/vector/detail/vector_forward_ctor.hpp +++ b/include/boost/fusion/sequence/container/vector/detail/vector_forward_ctor.hpp @@ -13,7 +13,7 @@ #include #define BOOST_PP_FILENAME_1 \ - + #define BOOST_PP_ITERATION_LIMITS (1, FUSION_MAX_VECTOR_SIZE) #include BOOST_PP_ITERATE() diff --git a/include/boost/fusion/container/vector/detail/vector_n.hpp b/include/boost/fusion/sequence/container/vector/detail/vector_n.hpp similarity index 100% rename from include/boost/fusion/container/vector/detail/vector_n.hpp rename to include/boost/fusion/sequence/container/vector/detail/vector_n.hpp diff --git a/include/boost/fusion/container/vector/detail/vector_n_chooser.hpp b/include/boost/fusion/sequence/container/vector/detail/vector_n_chooser.hpp similarity index 85% rename from include/boost/fusion/container/vector/detail/vector_n_chooser.hpp rename to include/boost/fusion/sequence/container/vector/detail/vector_n_chooser.hpp index 29248907..8f372b9b 100644 --- a/include/boost/fusion/container/vector/detail/vector_n_chooser.hpp +++ b/include/boost/fusion/sequence/container/vector/detail/vector_n_chooser.hpp @@ -8,21 +8,21 @@ #if !defined(FUSION_VECTOR_N_CHOOSER_07072005_1248) #define FUSION_VECTOR_N_CHOOSER_07072005_1248 -#include +#include // include vector0..N where N is FUSION_MAX_VECTOR_SIZE -#include +#include #if (FUSION_MAX_VECTOR_SIZE > 10) -#include +#include #endif #if (FUSION_MAX_VECTOR_SIZE > 20) -#include +#include #endif #if (FUSION_MAX_VECTOR_SIZE > 30) -#include +#include #endif #if (FUSION_MAX_VECTOR_SIZE > 40) -#include +#include #endif #include @@ -52,7 +52,7 @@ namespace boost { namespace fusion { namespace detail }; #define BOOST_PP_FILENAME_1 \ - + #define BOOST_PP_ITERATION_LIMITS (1, FUSION_MAX_VECTOR_SIZE) #include BOOST_PP_ITERATE() diff --git a/include/boost/fusion/container/vector/limits.hpp b/include/boost/fusion/sequence/container/vector/limits.hpp similarity index 100% rename from include/boost/fusion/container/vector/limits.hpp rename to include/boost/fusion/sequence/container/vector/limits.hpp diff --git a/include/boost/fusion/container/vector/vector.hpp b/include/boost/fusion/sequence/container/vector/vector.hpp similarity index 93% rename from include/boost/fusion/container/vector/vector.hpp rename to include/boost/fusion/sequence/container/vector/vector.hpp index bd05badd..a2fa9bc4 100644 --- a/include/boost/fusion/container/vector/vector.hpp +++ b/include/boost/fusion/sequence/container/vector/vector.hpp @@ -7,9 +7,9 @@ #if !defined(FUSION_VECTOR_07072005_1244) #define FUSION_VECTOR_07072005_1244 -#include -#include -#include +#include +#include +#include #include #include #include @@ -70,7 +70,7 @@ namespace boost { namespace fusion // typename detail::call_param::type _0 // , typename detail::call_param::type _1) // : vec(_0, _1) {} - #include + #include template vector& diff --git a/include/boost/fusion/container/vector/vector10.hpp b/include/boost/fusion/sequence/container/vector/vector10.hpp similarity index 84% rename from include/boost/fusion/container/vector/vector10.hpp rename to include/boost/fusion/sequence/container/vector/vector10.hpp index 28531b6f..6ff80a0c 100644 --- a/include/boost/fusion/container/vector/vector10.hpp +++ b/include/boost/fusion/sequence/container/vector/vector10.hpp @@ -12,10 +12,10 @@ #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include @@ -56,7 +56,7 @@ namespace boost { namespace fusion }; // expand vector1 to vector10 -#define BOOST_PP_FILENAME_1 +#define BOOST_PP_FILENAME_1 #define BOOST_PP_ITERATION_LIMITS (1, 10) #include BOOST_PP_ITERATE() diff --git a/include/boost/fusion/container/vector/vector20.hpp b/include/boost/fusion/sequence/container/vector/vector20.hpp similarity index 80% rename from include/boost/fusion/container/vector/vector20.hpp rename to include/boost/fusion/sequence/container/vector/vector20.hpp index be711006..63809dfb 100644 --- a/include/boost/fusion/container/vector/vector20.hpp +++ b/include/boost/fusion/sequence/container/vector/vector20.hpp @@ -12,10 +12,10 @@ #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include @@ -40,7 +40,7 @@ namespace boost { namespace fusion struct random_access_traversal_tag; // expand vector11 to vector20 -#define BOOST_PP_FILENAME_1 +#define BOOST_PP_FILENAME_1 #define BOOST_PP_ITERATION_LIMITS (11, 20) #include BOOST_PP_ITERATE() diff --git a/include/boost/fusion/container/vector/vector30.hpp b/include/boost/fusion/sequence/container/vector/vector30.hpp similarity index 80% rename from include/boost/fusion/container/vector/vector30.hpp rename to include/boost/fusion/sequence/container/vector/vector30.hpp index efbe9293..0c094ebd 100644 --- a/include/boost/fusion/container/vector/vector30.hpp +++ b/include/boost/fusion/sequence/container/vector/vector30.hpp @@ -12,10 +12,10 @@ #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include @@ -40,7 +40,7 @@ namespace boost { namespace fusion struct random_access_traversal_tag; // expand vector21 to vector30 -#define BOOST_PP_FILENAME_1 +#define BOOST_PP_FILENAME_1 #define BOOST_PP_ITERATION_LIMITS (21, 30) #include BOOST_PP_ITERATE() diff --git a/include/boost/fusion/container/vector/vector40.hpp b/include/boost/fusion/sequence/container/vector/vector40.hpp similarity index 80% rename from include/boost/fusion/container/vector/vector40.hpp rename to include/boost/fusion/sequence/container/vector/vector40.hpp index b72a23c5..ecb13b71 100644 --- a/include/boost/fusion/container/vector/vector40.hpp +++ b/include/boost/fusion/sequence/container/vector/vector40.hpp @@ -12,10 +12,10 @@ #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include @@ -40,7 +40,7 @@ namespace boost { namespace fusion struct random_access_traversal_tag; // expand vector31 to vector40 -#define BOOST_PP_FILENAME_1 +#define BOOST_PP_FILENAME_1 #define BOOST_PP_ITERATION_LIMITS (31, 40) #include BOOST_PP_ITERATE() diff --git a/include/boost/fusion/container/vector/vector50.hpp b/include/boost/fusion/sequence/container/vector/vector50.hpp similarity index 80% rename from include/boost/fusion/container/vector/vector50.hpp rename to include/boost/fusion/sequence/container/vector/vector50.hpp index ab8515d7..f5109448 100644 --- a/include/boost/fusion/container/vector/vector50.hpp +++ b/include/boost/fusion/sequence/container/vector/vector50.hpp @@ -12,10 +12,10 @@ #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include @@ -40,7 +40,7 @@ namespace boost { namespace fusion struct random_access_traversal_tag; // expand vector41 to vector50 -#define BOOST_PP_FILENAME_1 +#define BOOST_PP_FILENAME_1 #define BOOST_PP_ITERATION_LIMITS (41, 50) #include BOOST_PP_ITERATE() diff --git a/include/boost/fusion/container/vector/vector_fwd.hpp b/include/boost/fusion/sequence/container/vector/vector_fwd.hpp similarity index 92% rename from include/boost/fusion/container/vector/vector_fwd.hpp rename to include/boost/fusion/sequence/container/vector/vector_fwd.hpp index a6b9cc66..8d1e23d6 100644 --- a/include/boost/fusion/container/vector/vector_fwd.hpp +++ b/include/boost/fusion/sequence/container/vector/vector_fwd.hpp @@ -8,7 +8,7 @@ #if !defined(FUSION_VECTOR_FORWARD_07072005_0125) #define FUSION_VECTOR_FORWARD_07072005_0125 -#include +#include #include namespace boost { namespace fusion diff --git a/include/boost/fusion/container/vector/vector_iterator.hpp b/include/boost/fusion/sequence/container/vector/vector_iterator.hpp similarity index 70% rename from include/boost/fusion/container/vector/vector_iterator.hpp rename to include/boost/fusion/sequence/container/vector/vector_iterator.hpp index 9feeb520..fee4f6b0 100644 --- a/include/boost/fusion/container/vector/vector_iterator.hpp +++ b/include/boost/fusion/sequence/container/vector/vector_iterator.hpp @@ -8,13 +8,13 @@ #define FUSION_VECTOR_ITERATOR_05042005_0635 #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/include/boost/fusion/sequence/conversion.hpp b/include/boost/fusion/sequence/conversion.hpp new file mode 100644 index 00000000..e70cc88a --- /dev/null +++ b/include/boost/fusion/sequence/conversion.hpp @@ -0,0 +1,16 @@ +/*============================================================================= + 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(FUSION_SEQUENCE_CONVERSION_10022005_0622) +#define FUSION_SEQUENCE_CONVERSION_10022005_0622 + +#include +#include +#include +#include +#include + +#endif diff --git a/include/boost/fusion/container/deque/convert.hpp b/include/boost/fusion/sequence/conversion/as_deque.hpp similarity index 81% rename from include/boost/fusion/container/deque/convert.hpp rename to include/boost/fusion/sequence/conversion/as_deque.hpp index 0f3a75e2..78ae1273 100644 --- a/include/boost/fusion/container/deque/convert.hpp +++ b/include/boost/fusion/sequence/conversion/as_deque.hpp @@ -2,19 +2,18 @@ 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) ==============================================================================*/ -#if !defined(FUSION_CONVERT_20061213_2207) -#define FUSION_CONVERT_20061213_2207 +#if !defined(FUSION_AS_DEQUE_20061213_2207) +#define FUSION_AS_DEQUE_20061213_2207 -#include -#include -#include +#include +#include #include #include -namespace boost { namespace fusion +namespace boost { namespace fusion { namespace result_of { diff --git a/include/boost/fusion/container/list/convert.hpp b/include/boost/fusion/sequence/conversion/as_list.hpp similarity index 81% rename from include/boost/fusion/container/list/convert.hpp rename to include/boost/fusion/sequence/conversion/as_list.hpp index 418158cf..21b70bee 100644 --- a/include/boost/fusion/container/list/convert.hpp +++ b/include/boost/fusion/sequence/conversion/as_list.hpp @@ -1,27 +1,26 @@ /*============================================================================= 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_CONVERT_09232005_1215) -#define FUSION_CONVERT_09232005_1215 +#if !defined(FUSION_AS_LIST_09232005_1215) +#define FUSION_AS_LIST_09232005_1215 -#include -#include -#include +#include #include #include #include +#include -namespace boost { namespace fusion +namespace boost { namespace fusion { namespace result_of { template struct as_list { - typedef typename + typedef typename detail::build_cons< typename result_of::begin::type , typename result_of::end::type diff --git a/include/boost/fusion/container/map/convert.hpp b/include/boost/fusion/sequence/conversion/as_map.hpp similarity index 81% rename from include/boost/fusion/container/map/convert.hpp rename to include/boost/fusion/sequence/conversion/as_map.hpp index f174da58..4195dc25 100644 --- a/include/boost/fusion/container/map/convert.hpp +++ b/include/boost/fusion/sequence/conversion/as_map.hpp @@ -1,19 +1,18 @@ /*============================================================================= 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_CONVERT_09232005_1340) -#define FUSION_CONVERT_09232005_1340 +#if !defined(FUSION_AS_MAP_09232005_1340) +#define FUSION_AS_MAP_09232005_1340 -#include -#include -#include +#include +#include #include #include -namespace boost { namespace fusion +namespace boost { namespace fusion { namespace result_of { diff --git a/include/boost/fusion/container/set/convert.hpp b/include/boost/fusion/sequence/conversion/as_set.hpp similarity index 81% rename from include/boost/fusion/container/set/convert.hpp rename to include/boost/fusion/sequence/conversion/as_set.hpp index 1aaddf0c..9d9c02df 100644 --- a/include/boost/fusion/container/set/convert.hpp +++ b/include/boost/fusion/sequence/conversion/as_set.hpp @@ -1,19 +1,18 @@ /*============================================================================= 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_CONVERT_09232005_1341) -#define FUSION_CONVERT_09232005_1341 +#if !defined(FUSION_AS_SET_09232005_1341) +#define FUSION_AS_SET_09232005_1341 -#include -#include -#include +#include +#include #include #include -namespace boost { namespace fusion +namespace boost { namespace fusion { namespace result_of { diff --git a/include/boost/fusion/container/vector/convert.hpp b/include/boost/fusion/sequence/conversion/as_vector.hpp similarity index 80% rename from include/boost/fusion/container/vector/convert.hpp rename to include/boost/fusion/sequence/conversion/as_vector.hpp index a31578a2..3e8cfab1 100644 --- a/include/boost/fusion/container/vector/convert.hpp +++ b/include/boost/fusion/sequence/conversion/as_vector.hpp @@ -1,19 +1,18 @@ /*============================================================================= 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_CONVERT_09222005_1104) -#define FUSION_CONVERT_09222005_1104 +#if !defined(FUSION_AS_VECTOR_09222005_1104) +#define FUSION_AS_VECTOR_09222005_1104 -#include -#include -#include +#include +#include #include #include -namespace boost { namespace fusion +namespace boost { namespace fusion { namespace result_of { diff --git a/include/boost/fusion/container/deque/detail/as_deque.hpp b/include/boost/fusion/sequence/conversion/detail/as_deque.hpp similarity index 95% rename from include/boost/fusion/container/deque/detail/as_deque.hpp rename to include/boost/fusion/sequence/conversion/detail/as_deque.hpp index e48b7910..04e2a559 100644 --- a/include/boost/fusion/container/deque/detail/as_deque.hpp +++ b/include/boost/fusion/sequence/conversion/detail/as_deque.hpp @@ -16,7 +16,7 @@ #include #include #include -#include +#include #include #include #include @@ -55,7 +55,7 @@ namespace boost { namespace fusion { namespace detail typedef typename fusion::result_of::value_of::type \ BOOST_PP_CAT(T, n); -#define BOOST_PP_FILENAME_1 +#define BOOST_PP_FILENAME_1 #define BOOST_PP_ITERATION_LIMITS (1, FUSION_MAX_DEQUE_SIZE) #include BOOST_PP_ITERATE() diff --git a/include/boost/fusion/container/map/detail/as_map.hpp b/include/boost/fusion/sequence/conversion/detail/as_map.hpp similarity index 95% rename from include/boost/fusion/container/map/detail/as_map.hpp rename to include/boost/fusion/sequence/conversion/detail/as_map.hpp index 326877f9..d163311c 100644 --- a/include/boost/fusion/container/map/detail/as_map.hpp +++ b/include/boost/fusion/sequence/conversion/detail/as_map.hpp @@ -15,7 +15,7 @@ #include #include #include -#include +#include #include #include #include @@ -54,7 +54,7 @@ namespace boost { namespace fusion { namespace detail typedef typename fusion::result_of::value_of::type \ BOOST_PP_CAT(T, n); -#define BOOST_PP_FILENAME_1 +#define BOOST_PP_FILENAME_1 #define BOOST_PP_ITERATION_LIMITS (1, FUSION_MAX_MAP_SIZE) #include BOOST_PP_ITERATE() diff --git a/include/boost/fusion/container/set/detail/as_set.hpp b/include/boost/fusion/sequence/conversion/detail/as_set.hpp similarity index 95% rename from include/boost/fusion/container/set/detail/as_set.hpp rename to include/boost/fusion/sequence/conversion/detail/as_set.hpp index 33786338..bd21f3c0 100644 --- a/include/boost/fusion/container/set/detail/as_set.hpp +++ b/include/boost/fusion/sequence/conversion/detail/as_set.hpp @@ -15,7 +15,7 @@ #include #include #include -#include +#include #include #include #include @@ -54,7 +54,7 @@ namespace boost { namespace fusion { namespace detail typedef typename fusion::result_of::value_of::type \ BOOST_PP_CAT(T, n); -#define BOOST_PP_FILENAME_1 +#define BOOST_PP_FILENAME_1 #define BOOST_PP_ITERATION_LIMITS (1, FUSION_MAX_SET_SIZE) #include BOOST_PP_ITERATE() diff --git a/include/boost/fusion/container/vector/detail/as_vector.hpp b/include/boost/fusion/sequence/conversion/detail/as_vector.hpp similarity index 95% rename from include/boost/fusion/container/vector/detail/as_vector.hpp rename to include/boost/fusion/sequence/conversion/detail/as_vector.hpp index fa8dadcf..ffd79df0 100644 --- a/include/boost/fusion/container/vector/detail/as_vector.hpp +++ b/include/boost/fusion/sequence/conversion/detail/as_vector.hpp @@ -15,7 +15,7 @@ #include #include #include -#include +#include #include #include #include @@ -54,7 +54,7 @@ namespace boost { namespace fusion { namespace detail typedef typename fusion::result_of::value_of::type \ BOOST_PP_CAT(T, n); -#define BOOST_PP_FILENAME_1 +#define BOOST_PP_FILENAME_1 #define BOOST_PP_ITERATION_LIMITS (1, FUSION_MAX_VECTOR_SIZE) #include BOOST_PP_ITERATE() diff --git a/include/boost/fusion/container/list/detail/build_cons.hpp b/include/boost/fusion/sequence/conversion/detail/build_cons.hpp similarity index 96% rename from include/boost/fusion/container/list/detail/build_cons.hpp rename to include/boost/fusion/sequence/conversion/detail/build_cons.hpp index befbd4e9..4b08447f 100644 --- a/include/boost/fusion/container/list/detail/build_cons.hpp +++ b/include/boost/fusion/sequence/conversion/detail/build_cons.hpp @@ -7,7 +7,7 @@ #if !defined(FUSION_BUILD_CONS_09232005_1222) #define FUSION_BUILD_CONS_09232005_1222 -#include +#include #include #include #include diff --git a/include/boost/fusion/sequence/convert.hpp b/include/boost/fusion/sequence/convert.hpp deleted file mode 100644 index a6e3ccca..00000000 --- a/include/boost/fusion/sequence/convert.hpp +++ /dev/null @@ -1,48 +0,0 @@ -/*============================================================================= - 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(FUSION_CONVERT_10022005_1442) -#define FUSION_CONVERT_10022005_1442 - -namespace boost { namespace fusion -{ - namespace extension - { - template - struct convert_impl; - } - - namespace result_of - { - template - struct convert - { - typedef typename extension::convert_impl gen; - - typedef typename - gen::template apply::type - type; - }; - } - - template - inline typename result_of::convert::type - convert(Sequence& seq) - { - typedef typename result_of::convert::gen gen; - return gen::call(seq); - } - - template - inline typename result_of::convert::type - convert(Sequence const& seq) - { - typedef typename result_of::convert::gen gen; - return gen::call(seq); - } -}} - -#endif diff --git a/include/boost/fusion/sequence/generation/cons_tie.hpp b/include/boost/fusion/sequence/generation/cons_tie.hpp index 88ce0aa4..2b695d25 100644 --- a/include/boost/fusion/sequence/generation/cons_tie.hpp +++ b/include/boost/fusion/sequence/generation/cons_tie.hpp @@ -7,7 +7,7 @@ #if !defined(FUSION_CONS_TIE_07182005_0854) #define FUSION_CONS_TIE_07182005_0854 -#include +#include namespace boost { namespace fusion { diff --git a/include/boost/fusion/sequence/generation/deque_tie.hpp b/include/boost/fusion/sequence/generation/deque_tie.hpp index 5f8a2f08..77478c03 100644 --- a/include/boost/fusion/sequence/generation/deque_tie.hpp +++ b/include/boost/fusion/sequence/generation/deque_tie.hpp @@ -14,7 +14,7 @@ #include #include #include -#include +#include namespace boost { namespace fusion { diff --git a/include/boost/fusion/sequence/generation/list_tie.hpp b/include/boost/fusion/sequence/generation/list_tie.hpp index 946fdbc3..56fb6823 100644 --- a/include/boost/fusion/sequence/generation/list_tie.hpp +++ b/include/boost/fusion/sequence/generation/list_tie.hpp @@ -13,7 +13,7 @@ #include #include #include -#include +#include namespace boost { namespace fusion { diff --git a/include/boost/fusion/sequence/generation/make_cons.hpp b/include/boost/fusion/sequence/generation/make_cons.hpp index 47a2f461..704b35e2 100644 --- a/include/boost/fusion/sequence/generation/make_cons.hpp +++ b/include/boost/fusion/sequence/generation/make_cons.hpp @@ -9,7 +9,7 @@ #define FUSION_MAKE_CONS_07172005_0918 #include -#include +#include namespace boost { namespace fusion { diff --git a/include/boost/fusion/sequence/generation/make_deque.hpp b/include/boost/fusion/sequence/generation/make_deque.hpp index 5bcd4962..4c8544c2 100644 --- a/include/boost/fusion/sequence/generation/make_deque.hpp +++ b/include/boost/fusion/sequence/generation/make_deque.hpp @@ -19,7 +19,7 @@ #include #include #include -#include +#include #include namespace boost { namespace fusion diff --git a/include/boost/fusion/sequence/generation/make_list.hpp b/include/boost/fusion/sequence/generation/make_list.hpp index 122fe751..a37a2367 100644 --- a/include/boost/fusion/sequence/generation/make_list.hpp +++ b/include/boost/fusion/sequence/generation/make_list.hpp @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include namespace boost { namespace fusion diff --git a/include/boost/fusion/sequence/generation/make_map.hpp b/include/boost/fusion/sequence/generation/make_map.hpp index 5bc054e3..885cea2b 100644 --- a/include/boost/fusion/sequence/generation/make_map.hpp +++ b/include/boost/fusion/sequence/generation/make_map.hpp @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include #include diff --git a/include/boost/fusion/sequence/generation/make_set.hpp b/include/boost/fusion/sequence/generation/make_set.hpp index b434923f..7f56159c 100644 --- a/include/boost/fusion/sequence/generation/make_set.hpp +++ b/include/boost/fusion/sequence/generation/make_set.hpp @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include #include diff --git a/include/boost/fusion/sequence/generation/make_vector.hpp b/include/boost/fusion/sequence/generation/make_vector.hpp index b73598d6..2dc292fd 100644 --- a/include/boost/fusion/sequence/generation/make_vector.hpp +++ b/include/boost/fusion/sequence/generation/make_vector.hpp @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include namespace boost { namespace fusion diff --git a/include/boost/fusion/sequence/generation/map_tie.hpp b/include/boost/fusion/sequence/generation/map_tie.hpp index a5cb08c9..523a22d4 100644 --- a/include/boost/fusion/sequence/generation/map_tie.hpp +++ b/include/boost/fusion/sequence/generation/map_tie.hpp @@ -13,8 +13,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include diff --git a/include/boost/fusion/sequence/generation/vector_tie.hpp b/include/boost/fusion/sequence/generation/vector_tie.hpp index f70c4e89..b8cfe527 100644 --- a/include/boost/fusion/sequence/generation/vector_tie.hpp +++ b/include/boost/fusion/sequence/generation/vector_tie.hpp @@ -13,7 +13,7 @@ #include #include #include -#include +#include namespace boost { namespace fusion { diff --git a/include/boost/fusion/sequence/intrinsic.hpp b/include/boost/fusion/sequence/intrinsic.hpp index 8c5f4abd..59aaf9ff 100644 --- a/include/boost/fusion/sequence/intrinsic.hpp +++ b/include/boost/fusion/sequence/intrinsic.hpp @@ -1,7 +1,7 @@ /*============================================================================= 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_SEQUENCE_INTRINSIC_10022005_0618) @@ -14,6 +14,7 @@ #include #include #include +#include #include #include #include diff --git a/include/boost/fusion/sequence/intrinsic/mpl.hpp b/include/boost/fusion/sequence/intrinsic/mpl.hpp new file mode 100644 index 00000000..9d5bb609 --- /dev/null +++ b/include/boost/fusion/sequence/intrinsic/mpl.hpp @@ -0,0 +1,28 @@ +/*============================================================================= + 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(FUSION_SEQUENCE_INTRINSIC_MPL_10022005_1641) +#define FUSION_SEQUENCE_INTRINSIC_MPL_10022005_1641 + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#endif diff --git a/include/boost/fusion/mpl/at.hpp b/include/boost/fusion/sequence/intrinsic/mpl/at.hpp similarity index 100% rename from include/boost/fusion/mpl/at.hpp rename to include/boost/fusion/sequence/intrinsic/mpl/at.hpp diff --git a/include/boost/fusion/mpl/back.hpp b/include/boost/fusion/sequence/intrinsic/mpl/back.hpp similarity index 100% rename from include/boost/fusion/mpl/back.hpp rename to include/boost/fusion/sequence/intrinsic/mpl/back.hpp diff --git a/include/boost/fusion/mpl/begin.hpp b/include/boost/fusion/sequence/intrinsic/mpl/begin.hpp similarity index 93% rename from include/boost/fusion/mpl/begin.hpp rename to include/boost/fusion/sequence/intrinsic/mpl/begin.hpp index be8b3142..6d344d75 100644 --- a/include/boost/fusion/mpl/begin.hpp +++ b/include/boost/fusion/sequence/intrinsic/mpl/begin.hpp @@ -9,7 +9,7 @@ #include #include -#include +#include #include namespace boost { namespace mpl diff --git a/include/boost/fusion/mpl/clear.hpp b/include/boost/fusion/sequence/intrinsic/mpl/clear.hpp similarity index 93% rename from include/boost/fusion/mpl/clear.hpp rename to include/boost/fusion/sequence/intrinsic/mpl/clear.hpp index 14b3489e..0f2d492b 100644 --- a/include/boost/fusion/mpl/clear.hpp +++ b/include/boost/fusion/sequence/intrinsic/mpl/clear.hpp @@ -9,7 +9,7 @@ #include #include -#include +#include namespace boost { namespace mpl { diff --git a/include/boost/fusion/sequence/intrinsic/mpl/detail/as.hpp b/include/boost/fusion/sequence/intrinsic/mpl/detail/as.hpp new file mode 100644 index 00000000..1537e549 --- /dev/null +++ b/include/boost/fusion/sequence/intrinsic/mpl/detail/as.hpp @@ -0,0 +1,80 @@ +/*============================================================================= + 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(FUSION_AS_10022005_1442) +#define FUSION_AS_10022005_1442 + +namespace boost { namespace fusion +{ + namespace result_of + { + template + struct as_list; + + template + struct as_map; + + template + struct as_set; + + template + struct as_vector; + + template + struct as_deque; + } + + namespace detail + { + template + struct as_impl; + + template <> + struct as_impl + { + template + struct apply : result_of::as_list {}; + }; + + template <> + struct as_impl + { + template + struct apply : result_of::as_map {}; + }; + + template <> + struct as_impl + { + template + struct apply : result_of::as_set {}; + }; + + template <> + struct as_impl + { + template + struct apply : result_of::as_vector {}; + }; + + template<> + struct as_impl + { + template + struct apply : result_of::as_deque {}; + }; + + template + struct as + { + typedef typename + as_impl::template apply::type + type; + }; + } +}} + +#endif diff --git a/include/boost/fusion/mpl/detail/clear.hpp b/include/boost/fusion/sequence/intrinsic/mpl/detail/clear.hpp similarity index 77% rename from include/boost/fusion/mpl/detail/clear.hpp rename to include/boost/fusion/sequence/intrinsic/mpl/detail/clear.hpp index d8c32d5a..28807cc7 100644 --- a/include/boost/fusion/mpl/detail/clear.hpp +++ b/include/boost/fusion/sequence/intrinsic/mpl/detail/clear.hpp @@ -7,11 +7,11 @@ #if !defined(FUSION_CLEAR_10022005_1442) #define FUSION_CLEAR_10022005_1442 -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include namespace boost { namespace fusion { diff --git a/include/boost/fusion/mpl/empty.hpp b/include/boost/fusion/sequence/intrinsic/mpl/empty.hpp similarity index 100% rename from include/boost/fusion/mpl/empty.hpp rename to include/boost/fusion/sequence/intrinsic/mpl/empty.hpp diff --git a/include/boost/fusion/mpl/end.hpp b/include/boost/fusion/sequence/intrinsic/mpl/end.hpp similarity index 93% rename from include/boost/fusion/mpl/end.hpp rename to include/boost/fusion/sequence/intrinsic/mpl/end.hpp index ed3320b2..7d84a81b 100644 --- a/include/boost/fusion/mpl/end.hpp +++ b/include/boost/fusion/sequence/intrinsic/mpl/end.hpp @@ -9,7 +9,7 @@ #include #include -#include +#include #include namespace boost { namespace mpl diff --git a/include/boost/fusion/mpl/erase.hpp b/include/boost/fusion/sequence/intrinsic/mpl/erase.hpp similarity index 78% rename from include/boost/fusion/mpl/erase.hpp rename to include/boost/fusion/sequence/intrinsic/mpl/erase.hpp index a8b092ae..0ee650e0 100644 --- a/include/boost/fusion/mpl/erase.hpp +++ b/include/boost/fusion/sequence/intrinsic/mpl/erase.hpp @@ -1,7 +1,7 @@ /*============================================================================= 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_10022005_1835) @@ -10,7 +10,7 @@ #include #include #include -#include +#include namespace boost { namespace mpl { @@ -23,13 +23,12 @@ namespace boost { namespace mpl template struct apply { - typedef typename - fusion::result_of::erase::type + typedef typename + fusion::result_of::erase::type result; - - typedef typename - fusion::result_of::convert< - typename fusion::detail::tag_of::type, result>::type + + typedef typename + fusion::detail::as::type, result>::type type; }; }; diff --git a/include/boost/fusion/mpl/erase_key.hpp b/include/boost/fusion/sequence/intrinsic/mpl/erase_key.hpp similarity index 78% rename from include/boost/fusion/mpl/erase_key.hpp rename to include/boost/fusion/sequence/intrinsic/mpl/erase_key.hpp index 3cda2686..6c8ba6cf 100644 --- a/include/boost/fusion/mpl/erase_key.hpp +++ b/include/boost/fusion/sequence/intrinsic/mpl/erase_key.hpp @@ -1,7 +1,7 @@ /*============================================================================= 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_KEY_10022005_1907) @@ -10,7 +10,7 @@ #include #include #include -#include +#include namespace boost { namespace mpl { @@ -23,13 +23,12 @@ namespace boost { namespace mpl template struct apply { - typedef typename - fusion::result_of::erase_key::type + typedef typename + fusion::result_of::erase_key::type result; - - typedef typename - fusion::result_of::convert< - typename fusion::detail::tag_of::type, result>::type + + typedef typename + fusion::detail::as::type, result>::type type; }; }; diff --git a/include/boost/fusion/mpl/front.hpp b/include/boost/fusion/sequence/intrinsic/mpl/front.hpp similarity index 100% rename from include/boost/fusion/mpl/front.hpp rename to include/boost/fusion/sequence/intrinsic/mpl/front.hpp diff --git a/include/boost/fusion/mpl/has_key.hpp b/include/boost/fusion/sequence/intrinsic/mpl/has_key.hpp similarity index 100% rename from include/boost/fusion/mpl/has_key.hpp rename to include/boost/fusion/sequence/intrinsic/mpl/has_key.hpp diff --git a/include/boost/fusion/mpl/insert.hpp b/include/boost/fusion/sequence/intrinsic/mpl/insert.hpp similarity index 78% rename from include/boost/fusion/mpl/insert.hpp rename to include/boost/fusion/sequence/intrinsic/mpl/insert.hpp index 76918ce9..7df943a5 100644 --- a/include/boost/fusion/mpl/insert.hpp +++ b/include/boost/fusion/sequence/intrinsic/mpl/insert.hpp @@ -1,7 +1,7 @@ /*============================================================================= 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_10022005_1837) @@ -10,7 +10,7 @@ #include #include #include -#include +#include namespace boost { namespace mpl { @@ -23,13 +23,12 @@ namespace boost { namespace mpl template struct apply { - typedef typename - fusion::result_of::insert::type + typedef typename + fusion::result_of::insert::type result; - - typedef typename - fusion::result_of::convert< - typename fusion::detail::tag_of::type, result>::type + + typedef typename + fusion::detail::as::type, result>::type type; }; }; diff --git a/include/boost/fusion/mpl/insert_range.hpp b/include/boost/fusion/sequence/intrinsic/mpl/insert_range.hpp similarity index 78% rename from include/boost/fusion/mpl/insert_range.hpp rename to include/boost/fusion/sequence/intrinsic/mpl/insert_range.hpp index 4da39365..1c7abc89 100644 --- a/include/boost/fusion/mpl/insert_range.hpp +++ b/include/boost/fusion/sequence/intrinsic/mpl/insert_range.hpp @@ -1,7 +1,7 @@ /*============================================================================= 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_10022005_1838) @@ -10,7 +10,7 @@ #include #include #include -#include +#include namespace boost { namespace mpl { @@ -23,13 +23,12 @@ namespace boost { namespace mpl template struct apply { - typedef typename - fusion::result_of::insert_range::type + typedef typename + fusion::result_of::insert_range::type result; - - typedef typename - fusion::result_of::convert< - typename fusion::detail::tag_of::type, result>::type + + typedef typename + fusion::detail::as::type, result>::type type; }; }; diff --git a/include/boost/fusion/mpl/pop_back.hpp b/include/boost/fusion/sequence/intrinsic/mpl/pop_back.hpp similarity index 73% rename from include/boost/fusion/mpl/pop_back.hpp rename to include/boost/fusion/sequence/intrinsic/mpl/pop_back.hpp index 84bd75a4..94dbba3a 100644 --- a/include/boost/fusion/mpl/pop_back.hpp +++ b/include/boost/fusion/sequence/intrinsic/mpl/pop_back.hpp @@ -1,7 +1,7 @@ /*============================================================================= 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_POP_BACK_10022005_1801) @@ -10,7 +10,7 @@ #include #include #include -#include +#include namespace boost { namespace mpl { @@ -23,13 +23,12 @@ namespace boost { namespace mpl template struct apply { - typedef typename - fusion::result_of::pop_back::type + typedef typename + fusion::result_of::pop_back::type result; - - typedef typename - fusion::result_of::convert< - typename fusion::detail::tag_of::type, result>::type + + typedef typename + fusion::detail::as::type, result>::type type; }; }; diff --git a/include/boost/fusion/mpl/pop_front.hpp b/include/boost/fusion/sequence/intrinsic/mpl/pop_front.hpp similarity index 73% rename from include/boost/fusion/mpl/pop_front.hpp rename to include/boost/fusion/sequence/intrinsic/mpl/pop_front.hpp index ffe6c302..957a673e 100644 --- a/include/boost/fusion/mpl/pop_front.hpp +++ b/include/boost/fusion/sequence/intrinsic/mpl/pop_front.hpp @@ -1,7 +1,7 @@ /*============================================================================= 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_POP_FRONT_10022005_1800) @@ -10,7 +10,7 @@ #include #include #include -#include +#include namespace boost { namespace mpl { @@ -23,13 +23,12 @@ namespace boost { namespace mpl template struct apply { - typedef typename - fusion::result_of::pop_front::type + typedef typename + fusion::result_of::pop_front::type result; - - typedef typename - fusion::result_of::convert< - typename fusion::detail::tag_of::type, result>::type + + typedef typename + fusion::detail::as::type, result>::type type; }; }; diff --git a/include/boost/fusion/mpl/push_back.hpp b/include/boost/fusion/sequence/intrinsic/mpl/push_back.hpp similarity index 73% rename from include/boost/fusion/mpl/push_back.hpp rename to include/boost/fusion/sequence/intrinsic/mpl/push_back.hpp index e96faa06..e828af9e 100644 --- a/include/boost/fusion/mpl/push_back.hpp +++ b/include/boost/fusion/sequence/intrinsic/mpl/push_back.hpp @@ -1,7 +1,7 @@ /*============================================================================= 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_PUSH_BACK_10022005_1647) @@ -10,7 +10,7 @@ #include #include #include -#include +#include namespace boost { namespace mpl { @@ -23,13 +23,12 @@ namespace boost { namespace mpl template struct apply { - typedef typename - fusion::result_of::push_back::type + typedef typename + fusion::result_of::push_back::type result; - - typedef typename - fusion::result_of::convert< - typename fusion::detail::tag_of::type, result>::type + + typedef typename + fusion::detail::as::type, result>::type type; }; }; diff --git a/include/boost/fusion/mpl/push_front.hpp b/include/boost/fusion/sequence/intrinsic/mpl/push_front.hpp similarity index 79% rename from include/boost/fusion/mpl/push_front.hpp rename to include/boost/fusion/sequence/intrinsic/mpl/push_front.hpp index c508d652..00431af2 100644 --- a/include/boost/fusion/mpl/push_front.hpp +++ b/include/boost/fusion/sequence/intrinsic/mpl/push_front.hpp @@ -1,7 +1,7 @@ /*============================================================================= 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_PUSH_FRONT_10022005_1720) @@ -10,7 +10,7 @@ #include #include #include -#include +#include namespace boost { namespace mpl { @@ -23,13 +23,12 @@ namespace boost { namespace mpl template struct apply { - typedef typename - fusion::result_of::push_front::type + typedef typename + fusion::result_of::push_front::type result; - - typedef typename - fusion::result_of::convert< - typename fusion::detail::tag_of::type, result>::type + + typedef typename + fusion::detail::as::type, result>::type type; }; }; diff --git a/include/boost/fusion/mpl/size.hpp b/include/boost/fusion/sequence/intrinsic/mpl/size.hpp similarity index 100% rename from include/boost/fusion/mpl/size.hpp rename to include/boost/fusion/sequence/intrinsic/mpl/size.hpp diff --git a/include/boost/fusion/sequence/intrinsic/swap.hpp b/include/boost/fusion/sequence/intrinsic/swap.hpp index 7a385ae8..90570c1f 100644 --- a/include/boost/fusion/sequence/intrinsic/swap.hpp +++ b/include/boost/fusion/sequence/intrinsic/swap.hpp @@ -11,7 +11,7 @@ #include #include -#include +#include #include #include #include diff --git a/include/boost/fusion/view.hpp b/include/boost/fusion/sequence/view.hpp similarity index 58% rename from include/boost/fusion/view.hpp rename to include/boost/fusion/sequence/view.hpp index 12d5cc5d..712a9ac5 100644 --- a/include/boost/fusion/view.hpp +++ b/include/boost/fusion/sequence/view.hpp @@ -7,11 +7,11 @@ #if !defined(FUSION_SEQUENCE_VIEW_10022005_0620) #define FUSION_SEQUENCE_VIEW_10022005_0620 -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #endif diff --git a/include/boost/fusion/view/ext_/multiple_view.hpp b/include/boost/fusion/sequence/view/ext_/multiple_view.hpp similarity index 100% rename from include/boost/fusion/view/ext_/multiple_view.hpp rename to include/boost/fusion/sequence/view/ext_/multiple_view.hpp diff --git a/include/boost/fusion/view/ext_/segmented_iterator.hpp b/include/boost/fusion/sequence/view/ext_/segmented_iterator.hpp similarity index 99% rename from include/boost/fusion/view/ext_/segmented_iterator.hpp rename to include/boost/fusion/sequence/view/ext_/segmented_iterator.hpp index 2216929b..2f6c1f74 100755 --- a/include/boost/fusion/view/ext_/segmented_iterator.hpp +++ b/include/boost/fusion/sequence/view/ext_/segmented_iterator.hpp @@ -17,8 +17,8 @@ #include #include #include -#include -#include // for nil +#include +#include // for nil #include #include #include diff --git a/include/boost/fusion/view/ext_/segmented_iterator_range.hpp b/include/boost/fusion/sequence/view/ext_/segmented_iterator_range.hpp similarity index 97% rename from include/boost/fusion/view/ext_/segmented_iterator_range.hpp rename to include/boost/fusion/sequence/view/ext_/segmented_iterator_range.hpp index c4dcd01c..7bab8789 100755 --- a/include/boost/fusion/view/ext_/segmented_iterator_range.hpp +++ b/include/boost/fusion/sequence/view/ext_/segmented_iterator_range.hpp @@ -12,15 +12,13 @@ #include #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include namespace boost { namespace fusion { diff --git a/include/boost/fusion/view/filter_view.hpp b/include/boost/fusion/sequence/view/filter_view.hpp similarity index 77% rename from include/boost/fusion/view/filter_view.hpp rename to include/boost/fusion/sequence/view/filter_view.hpp index c649407f..d8fb4936 100644 --- a/include/boost/fusion/view/filter_view.hpp +++ b/include/boost/fusion/sequence/view/filter_view.hpp @@ -7,7 +7,7 @@ #if !defined(FUSION_SEQUENCE_VIEW_FILTER_VIEW_10022005_0608) #define FUSION_SEQUENCE_VIEW_FILTER_VIEW_10022005_0608 -#include -#include +#include +#include #endif diff --git a/include/boost/fusion/view/filter_view/detail/begin_impl.hpp b/include/boost/fusion/sequence/view/filter_view/detail/begin_impl.hpp similarity index 100% rename from include/boost/fusion/view/filter_view/detail/begin_impl.hpp rename to include/boost/fusion/sequence/view/filter_view/detail/begin_impl.hpp diff --git a/include/boost/fusion/view/filter_view/detail/deref_impl.hpp b/include/boost/fusion/sequence/view/filter_view/detail/deref_impl.hpp similarity index 100% rename from include/boost/fusion/view/filter_view/detail/deref_impl.hpp rename to include/boost/fusion/sequence/view/filter_view/detail/deref_impl.hpp diff --git a/include/boost/fusion/view/filter_view/detail/end_impl.hpp b/include/boost/fusion/sequence/view/filter_view/detail/end_impl.hpp similarity index 100% rename from include/boost/fusion/view/filter_view/detail/end_impl.hpp rename to include/boost/fusion/sequence/view/filter_view/detail/end_impl.hpp diff --git a/include/boost/fusion/view/filter_view/detail/equal_to_impl.hpp b/include/boost/fusion/sequence/view/filter_view/detail/equal_to_impl.hpp similarity index 100% rename from include/boost/fusion/view/filter_view/detail/equal_to_impl.hpp rename to include/boost/fusion/sequence/view/filter_view/detail/equal_to_impl.hpp diff --git a/include/boost/fusion/view/filter_view/detail/next_impl.hpp b/include/boost/fusion/sequence/view/filter_view/detail/next_impl.hpp similarity index 100% rename from include/boost/fusion/view/filter_view/detail/next_impl.hpp rename to include/boost/fusion/sequence/view/filter_view/detail/next_impl.hpp diff --git a/include/boost/fusion/view/filter_view/detail/size_impl.hpp b/include/boost/fusion/sequence/view/filter_view/detail/size_impl.hpp similarity index 100% rename from include/boost/fusion/view/filter_view/detail/size_impl.hpp rename to include/boost/fusion/sequence/view/filter_view/detail/size_impl.hpp diff --git a/include/boost/fusion/view/filter_view/detail/value_of_impl.hpp b/include/boost/fusion/sequence/view/filter_view/detail/value_of_impl.hpp similarity index 100% rename from include/boost/fusion/view/filter_view/detail/value_of_impl.hpp rename to include/boost/fusion/sequence/view/filter_view/detail/value_of_impl.hpp diff --git a/include/boost/fusion/view/filter_view/filter_view.hpp b/include/boost/fusion/sequence/view/filter_view/filter_view.hpp similarity index 85% rename from include/boost/fusion/view/filter_view/filter_view.hpp rename to include/boost/fusion/sequence/view/filter_view/filter_view.hpp index a34747e6..e09ec97f 100644 --- a/include/boost/fusion/view/filter_view/filter_view.hpp +++ b/include/boost/fusion/sequence/view/filter_view/filter_view.hpp @@ -10,10 +10,10 @@ #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include diff --git a/include/boost/fusion/view/filter_view/filter_view_iterator.hpp b/include/boost/fusion/sequence/view/filter_view/filter_view_iterator.hpp similarity index 82% rename from include/boost/fusion/view/filter_view/filter_view_iterator.hpp rename to include/boost/fusion/sequence/view/filter_view/filter_view_iterator.hpp index be93c657..aaf1d6e0 100644 --- a/include/boost/fusion/view/filter_view/filter_view_iterator.hpp +++ b/include/boost/fusion/sequence/view/filter_view/filter_view_iterator.hpp @@ -1,19 +1,18 @@ /*============================================================================= 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_FILTER_VIEW_ITERATOR_05062005_0849) #define FUSION_FILTER_VIEW_ITERATOR_05062005_0849 #include -#include #include -#include -#include -#include -#include +#include +#include +#include +#include #include namespace boost { namespace fusion diff --git a/include/boost/fusion/view/iterator_range.hpp b/include/boost/fusion/sequence/view/iterator_range.hpp similarity index 87% rename from include/boost/fusion/view/iterator_range.hpp rename to include/boost/fusion/sequence/view/iterator_range.hpp index f8d30221..16485eb4 100644 --- a/include/boost/fusion/view/iterator_range.hpp +++ b/include/boost/fusion/sequence/view/iterator_range.hpp @@ -7,6 +7,6 @@ #if !defined(FUSION_SEQUENCE_VIEW_ITERATOR_RANGE_10022005_0610) #define FUSION_SEQUENCE_VIEW_ITERATOR_RANGE_10022005_0610 -#include +#include #endif diff --git a/include/boost/fusion/view/iterator_range/detail/at_impl.hpp b/include/boost/fusion/sequence/view/iterator_range/detail/at_impl.hpp similarity index 100% rename from include/boost/fusion/view/iterator_range/detail/at_impl.hpp rename to include/boost/fusion/sequence/view/iterator_range/detail/at_impl.hpp diff --git a/include/boost/fusion/view/iterator_range/detail/begin_impl.hpp b/include/boost/fusion/sequence/view/iterator_range/detail/begin_impl.hpp similarity index 100% rename from include/boost/fusion/view/iterator_range/detail/begin_impl.hpp rename to include/boost/fusion/sequence/view/iterator_range/detail/begin_impl.hpp diff --git a/include/boost/fusion/view/iterator_range/detail/end_impl.hpp b/include/boost/fusion/sequence/view/iterator_range/detail/end_impl.hpp similarity index 100% rename from include/boost/fusion/view/iterator_range/detail/end_impl.hpp rename to include/boost/fusion/sequence/view/iterator_range/detail/end_impl.hpp diff --git a/include/boost/fusion/view/iterator_range/detail/value_at_impl.hpp b/include/boost/fusion/sequence/view/iterator_range/detail/value_at_impl.hpp similarity index 100% rename from include/boost/fusion/view/iterator_range/detail/value_at_impl.hpp rename to include/boost/fusion/sequence/view/iterator_range/detail/value_at_impl.hpp diff --git a/include/boost/fusion/view/iterator_range/iterator_range.hpp b/include/boost/fusion/sequence/view/iterator_range/iterator_range.hpp similarity index 83% rename from include/boost/fusion/view/iterator_range/iterator_range.hpp rename to include/boost/fusion/sequence/view/iterator_range/iterator_range.hpp index 0036f0ae..dee6c00a 100644 --- a/include/boost/fusion/view/iterator_range/iterator_range.hpp +++ b/include/boost/fusion/sequence/view/iterator_range/iterator_range.hpp @@ -1,7 +1,7 @@ /*============================================================================= 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_ITERATOR_RANGE_05062005_1224) @@ -10,13 +10,12 @@ #include #include #include -#include +#include +#include +#include +#include #include -#include -#include -#include -#include -#include +#include #include namespace boost { namespace fusion diff --git a/include/boost/fusion/view/joint_view.hpp b/include/boost/fusion/sequence/view/joint_view.hpp similarity index 77% rename from include/boost/fusion/view/joint_view.hpp rename to include/boost/fusion/sequence/view/joint_view.hpp index cd1b8571..6d9209a8 100644 --- a/include/boost/fusion/view/joint_view.hpp +++ b/include/boost/fusion/sequence/view/joint_view.hpp @@ -7,7 +7,7 @@ #if !defined(FUSION_SEQUENCE_VIEW_JOINT_VIEW_10022005_0610) #define FUSION_SEQUENCE_VIEW_JOINT_VIEW_10022005_0610 -#include -#include +#include +#include #endif diff --git a/include/boost/fusion/view/joint_view/detail/begin_impl.hpp b/include/boost/fusion/sequence/view/joint_view/detail/begin_impl.hpp similarity index 100% rename from include/boost/fusion/view/joint_view/detail/begin_impl.hpp rename to include/boost/fusion/sequence/view/joint_view/detail/begin_impl.hpp diff --git a/include/boost/fusion/view/joint_view/detail/deref_impl.hpp b/include/boost/fusion/sequence/view/joint_view/detail/deref_impl.hpp similarity index 100% rename from include/boost/fusion/view/joint_view/detail/deref_impl.hpp rename to include/boost/fusion/sequence/view/joint_view/detail/deref_impl.hpp diff --git a/include/boost/fusion/view/joint_view/detail/end_impl.hpp b/include/boost/fusion/sequence/view/joint_view/detail/end_impl.hpp similarity index 100% rename from include/boost/fusion/view/joint_view/detail/end_impl.hpp rename to include/boost/fusion/sequence/view/joint_view/detail/end_impl.hpp diff --git a/include/boost/fusion/view/joint_view/detail/next_impl.hpp b/include/boost/fusion/sequence/view/joint_view/detail/next_impl.hpp similarity index 100% rename from include/boost/fusion/view/joint_view/detail/next_impl.hpp rename to include/boost/fusion/sequence/view/joint_view/detail/next_impl.hpp diff --git a/include/boost/fusion/view/joint_view/detail/value_of_impl.hpp b/include/boost/fusion/sequence/view/joint_view/detail/value_of_impl.hpp similarity index 100% rename from include/boost/fusion/view/joint_view/detail/value_of_impl.hpp rename to include/boost/fusion/sequence/view/joint_view/detail/value_of_impl.hpp diff --git a/include/boost/fusion/view/joint_view/joint_view.hpp b/include/boost/fusion/sequence/view/joint_view/joint_view.hpp similarity index 91% rename from include/boost/fusion/view/joint_view/joint_view.hpp rename to include/boost/fusion/sequence/view/joint_view/joint_view.hpp index 9cc798d3..d0c48200 100644 --- a/include/boost/fusion/view/joint_view/joint_view.hpp +++ b/include/boost/fusion/sequence/view/joint_view/joint_view.hpp @@ -12,9 +12,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/include/boost/fusion/view/joint_view/joint_view_iterator.hpp b/include/boost/fusion/sequence/view/joint_view/joint_view_iterator.hpp similarity index 86% rename from include/boost/fusion/view/joint_view/joint_view_iterator.hpp rename to include/boost/fusion/sequence/view/joint_view/joint_view_iterator.hpp index 18696d7e..0bdfae07 100644 --- a/include/boost/fusion/view/joint_view/joint_view_iterator.hpp +++ b/include/boost/fusion/sequence/view/joint_view/joint_view_iterator.hpp @@ -1,7 +1,7 @@ /*============================================================================= 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_JOINT_VIEW_ITERATOR_07162005_0140) @@ -10,10 +10,9 @@ #include #include #include -#include -#include -#include -#include +#include +#include +#include #include namespace boost { namespace fusion diff --git a/include/boost/fusion/view/repetitive_view.hpp b/include/boost/fusion/sequence/view/repetitive_view.hpp similarity index 75% rename from include/boost/fusion/view/repetitive_view.hpp rename to include/boost/fusion/sequence/view/repetitive_view.hpp index fef1462f..8940174b 100644 --- a/include/boost/fusion/view/repetitive_view.hpp +++ b/include/boost/fusion/sequence/view/repetitive_view.hpp @@ -8,8 +8,8 @@ #if !defined(BOOST_FUSION_REPETITIVE_VIEW_HPP_INCLUDED) #define BOOST_FUSION_REPETITIVE_VIEW_HPP_INCLUDED -#include -#include +#include +#include #endif diff --git a/include/boost/fusion/view/repetitive_view/detail/begin_impl.hpp b/include/boost/fusion/sequence/view/repetitive_view/detail/begin_impl.hpp similarity index 94% rename from include/boost/fusion/view/repetitive_view/detail/begin_impl.hpp rename to include/boost/fusion/sequence/view/repetitive_view/detail/begin_impl.hpp index 321d7b8d..b5c4c29a 100644 --- a/include/boost/fusion/view/repetitive_view/detail/begin_impl.hpp +++ b/include/boost/fusion/sequence/view/repetitive_view/detail/begin_impl.hpp @@ -9,7 +9,7 @@ #define BOOST_FUSION_REPETITIVE_VIEW_BEGIN_IMPL_HPP_INCLUDED #include -#include +#include namespace boost { namespace fusion { diff --git a/include/boost/fusion/view/repetitive_view/detail/deref_impl.hpp b/include/boost/fusion/sequence/view/repetitive_view/detail/deref_impl.hpp similarity index 100% rename from include/boost/fusion/view/repetitive_view/detail/deref_impl.hpp rename to include/boost/fusion/sequence/view/repetitive_view/detail/deref_impl.hpp diff --git a/include/boost/fusion/view/repetitive_view/detail/end_impl.hpp b/include/boost/fusion/sequence/view/repetitive_view/detail/end_impl.hpp similarity index 94% rename from include/boost/fusion/view/repetitive_view/detail/end_impl.hpp rename to include/boost/fusion/sequence/view/repetitive_view/detail/end_impl.hpp index 52e36da5..00ac0874 100644 --- a/include/boost/fusion/view/repetitive_view/detail/end_impl.hpp +++ b/include/boost/fusion/sequence/view/repetitive_view/detail/end_impl.hpp @@ -9,7 +9,7 @@ #define BOOST_FUSION_REPETITIVE_VIEW_END_IMPL_HPP_INCLUDED #include -#include +#include namespace boost { namespace fusion { diff --git a/include/boost/fusion/view/repetitive_view/detail/next_impl.hpp b/include/boost/fusion/sequence/view/repetitive_view/detail/next_impl.hpp similarity index 100% rename from include/boost/fusion/view/repetitive_view/detail/next_impl.hpp rename to include/boost/fusion/sequence/view/repetitive_view/detail/next_impl.hpp diff --git a/include/boost/fusion/view/repetitive_view/detail/value_of_impl.hpp b/include/boost/fusion/sequence/view/repetitive_view/detail/value_of_impl.hpp similarity index 100% rename from include/boost/fusion/view/repetitive_view/detail/value_of_impl.hpp rename to include/boost/fusion/sequence/view/repetitive_view/detail/value_of_impl.hpp diff --git a/include/boost/fusion/view/repetitive_view/repetitive_view.hpp b/include/boost/fusion/sequence/view/repetitive_view/repetitive_view.hpp similarity index 90% rename from include/boost/fusion/view/repetitive_view/repetitive_view.hpp rename to include/boost/fusion/sequence/view/repetitive_view/repetitive_view.hpp index 050affb1..2e06fd80 100644 --- a/include/boost/fusion/view/repetitive_view/repetitive_view.hpp +++ b/include/boost/fusion/sequence/view/repetitive_view/repetitive_view.hpp @@ -14,8 +14,8 @@ #include #include -#include -#include +#include +#include namespace boost { namespace fusion diff --git a/include/boost/fusion/view/repetitive_view/repetitive_view_fwd.hpp b/include/boost/fusion/sequence/view/repetitive_view/repetitive_view_fwd.hpp similarity index 100% rename from include/boost/fusion/view/repetitive_view/repetitive_view_fwd.hpp rename to include/boost/fusion/sequence/view/repetitive_view/repetitive_view_fwd.hpp diff --git a/include/boost/fusion/view/repetitive_view/repetitive_view_iterator.hpp b/include/boost/fusion/sequence/view/repetitive_view/repetitive_view_iterator.hpp similarity index 84% rename from include/boost/fusion/view/repetitive_view/repetitive_view_iterator.hpp rename to include/boost/fusion/sequence/view/repetitive_view/repetitive_view_iterator.hpp index 9a7334de..6b2a9a5e 100644 --- a/include/boost/fusion/view/repetitive_view/repetitive_view_iterator.hpp +++ b/include/boost/fusion/sequence/view/repetitive_view/repetitive_view_iterator.hpp @@ -11,18 +11,17 @@ #include #include #include -#include #include #include -#include -#include -#include +#include +#include +#include namespace boost { namespace fusion { struct repetitive_view_iterator_tag; - template::type> struct repetitive_view_iterator : iterator_base< repetitive_view_iterator > diff --git a/include/boost/fusion/view/reverse_view.hpp b/include/boost/fusion/sequence/view/reverse_view.hpp similarity index 77% rename from include/boost/fusion/view/reverse_view.hpp rename to include/boost/fusion/sequence/view/reverse_view.hpp index 634b398c..6aa499e3 100644 --- a/include/boost/fusion/view/reverse_view.hpp +++ b/include/boost/fusion/sequence/view/reverse_view.hpp @@ -7,7 +7,7 @@ #if !defined(FUSION_SEQUENCE_VIEW_REVERSE_VIEW_10022005_0612) #define FUSION_SEQUENCE_VIEW_REVERSE_VIEW_10022005_0612 -#include -#include +#include +#include #endif diff --git a/include/boost/fusion/view/reverse_view/detail/advance_impl.hpp b/include/boost/fusion/sequence/view/reverse_view/detail/advance_impl.hpp similarity index 100% rename from include/boost/fusion/view/reverse_view/detail/advance_impl.hpp rename to include/boost/fusion/sequence/view/reverse_view/detail/advance_impl.hpp diff --git a/include/boost/fusion/view/reverse_view/detail/begin_impl.hpp b/include/boost/fusion/sequence/view/reverse_view/detail/begin_impl.hpp similarity index 100% rename from include/boost/fusion/view/reverse_view/detail/begin_impl.hpp rename to include/boost/fusion/sequence/view/reverse_view/detail/begin_impl.hpp diff --git a/include/boost/fusion/view/reverse_view/detail/deref_impl.hpp b/include/boost/fusion/sequence/view/reverse_view/detail/deref_impl.hpp similarity index 100% rename from include/boost/fusion/view/reverse_view/detail/deref_impl.hpp rename to include/boost/fusion/sequence/view/reverse_view/detail/deref_impl.hpp diff --git a/include/boost/fusion/view/reverse_view/detail/distance_impl.hpp b/include/boost/fusion/sequence/view/reverse_view/detail/distance_impl.hpp similarity index 100% rename from include/boost/fusion/view/reverse_view/detail/distance_impl.hpp rename to include/boost/fusion/sequence/view/reverse_view/detail/distance_impl.hpp diff --git a/include/boost/fusion/view/reverse_view/detail/end_impl.hpp b/include/boost/fusion/sequence/view/reverse_view/detail/end_impl.hpp similarity index 100% rename from include/boost/fusion/view/reverse_view/detail/end_impl.hpp rename to include/boost/fusion/sequence/view/reverse_view/detail/end_impl.hpp diff --git a/include/boost/fusion/view/reverse_view/detail/next_impl.hpp b/include/boost/fusion/sequence/view/reverse_view/detail/next_impl.hpp similarity index 100% rename from include/boost/fusion/view/reverse_view/detail/next_impl.hpp rename to include/boost/fusion/sequence/view/reverse_view/detail/next_impl.hpp diff --git a/include/boost/fusion/view/reverse_view/detail/prior_impl.hpp b/include/boost/fusion/sequence/view/reverse_view/detail/prior_impl.hpp similarity index 100% rename from include/boost/fusion/view/reverse_view/detail/prior_impl.hpp rename to include/boost/fusion/sequence/view/reverse_view/detail/prior_impl.hpp diff --git a/include/boost/fusion/view/reverse_view/detail/value_of_impl.hpp b/include/boost/fusion/sequence/view/reverse_view/detail/value_of_impl.hpp similarity index 100% rename from include/boost/fusion/view/reverse_view/detail/value_of_impl.hpp rename to include/boost/fusion/sequence/view/reverse_view/detail/value_of_impl.hpp diff --git a/include/boost/fusion/view/reverse_view/reverse_view.hpp b/include/boost/fusion/sequence/view/reverse_view/reverse_view.hpp similarity index 90% rename from include/boost/fusion/view/reverse_view/reverse_view.hpp rename to include/boost/fusion/sequence/view/reverse_view/reverse_view.hpp index c939f7ce..6e6f4c09 100644 --- a/include/boost/fusion/view/reverse_view/reverse_view.hpp +++ b/include/boost/fusion/sequence/view/reverse_view/reverse_view.hpp @@ -10,9 +10,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/include/boost/fusion/view/reverse_view/reverse_view_iterator.hpp b/include/boost/fusion/sequence/view/reverse_view/reverse_view_iterator.hpp similarity index 75% rename from include/boost/fusion/view/reverse_view/reverse_view_iterator.hpp rename to include/boost/fusion/sequence/view/reverse_view/reverse_view_iterator.hpp index 0a890437..5f44b8b5 100644 --- a/include/boost/fusion/view/reverse_view/reverse_view_iterator.hpp +++ b/include/boost/fusion/sequence/view/reverse_view/reverse_view_iterator.hpp @@ -1,7 +1,7 @@ /*============================================================================= 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_REVERSE_VIEW_ITERATOR_07202005_0835) @@ -10,13 +10,12 @@ #include #include #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include diff --git a/include/boost/fusion/view/single_view.hpp b/include/boost/fusion/sequence/view/single_view.hpp similarity index 76% rename from include/boost/fusion/view/single_view.hpp rename to include/boost/fusion/sequence/view/single_view.hpp index 3640fae8..e4a59476 100644 --- a/include/boost/fusion/view/single_view.hpp +++ b/include/boost/fusion/sequence/view/single_view.hpp @@ -7,7 +7,7 @@ #if !defined(FUSION_SINGLE_VIEW_03192006_2216) #define FUSION_SINGLE_VIEW_03192006_2216 -#include -#include +#include +#include #endif diff --git a/include/boost/fusion/view/single_view/detail/begin_impl.hpp b/include/boost/fusion/sequence/view/single_view/detail/begin_impl.hpp similarity index 100% rename from include/boost/fusion/view/single_view/detail/begin_impl.hpp rename to include/boost/fusion/sequence/view/single_view/detail/begin_impl.hpp diff --git a/include/boost/fusion/view/single_view/detail/deref_impl.hpp b/include/boost/fusion/sequence/view/single_view/detail/deref_impl.hpp similarity index 100% rename from include/boost/fusion/view/single_view/detail/deref_impl.hpp rename to include/boost/fusion/sequence/view/single_view/detail/deref_impl.hpp diff --git a/include/boost/fusion/view/single_view/detail/end_impl.hpp b/include/boost/fusion/sequence/view/single_view/detail/end_impl.hpp similarity index 100% rename from include/boost/fusion/view/single_view/detail/end_impl.hpp rename to include/boost/fusion/sequence/view/single_view/detail/end_impl.hpp diff --git a/include/boost/fusion/view/single_view/detail/next_impl.hpp b/include/boost/fusion/sequence/view/single_view/detail/next_impl.hpp similarity index 100% rename from include/boost/fusion/view/single_view/detail/next_impl.hpp rename to include/boost/fusion/sequence/view/single_view/detail/next_impl.hpp diff --git a/include/boost/fusion/view/single_view/detail/value_of_impl.hpp b/include/boost/fusion/sequence/view/single_view/detail/value_of_impl.hpp similarity index 100% rename from include/boost/fusion/view/single_view/detail/value_of_impl.hpp rename to include/boost/fusion/sequence/view/single_view/detail/value_of_impl.hpp diff --git a/include/boost/fusion/view/single_view/single_view.hpp b/include/boost/fusion/sequence/view/single_view/single_view.hpp similarity index 87% rename from include/boost/fusion/view/single_view/single_view.hpp rename to include/boost/fusion/sequence/view/single_view/single_view.hpp index 7c10afe6..31b68e20 100644 --- a/include/boost/fusion/view/single_view/single_view.hpp +++ b/include/boost/fusion/sequence/view/single_view/single_view.hpp @@ -10,9 +10,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include #include diff --git a/include/boost/fusion/view/single_view/single_view_iterator.hpp b/include/boost/fusion/sequence/view/single_view/single_view_iterator.hpp similarity index 86% rename from include/boost/fusion/view/single_view/single_view_iterator.hpp rename to include/boost/fusion/sequence/view/single_view/single_view_iterator.hpp index 1a44bb15..68155d37 100644 --- a/include/boost/fusion/view/single_view/single_view_iterator.hpp +++ b/include/boost/fusion/sequence/view/single_view/single_view_iterator.hpp @@ -9,9 +9,9 @@ #include #include -#include -#include -#include +#include +#include +#include namespace boost { namespace fusion { diff --git a/include/boost/fusion/view/transform_view.hpp b/include/boost/fusion/sequence/view/transform_view.hpp similarity index 76% rename from include/boost/fusion/view/transform_view.hpp rename to include/boost/fusion/sequence/view/transform_view.hpp index 744d063c..714f8784 100644 --- a/include/boost/fusion/view/transform_view.hpp +++ b/include/boost/fusion/sequence/view/transform_view.hpp @@ -7,7 +7,7 @@ #if !defined(FUSION_SEQUENCE_VIEW_TRANSFORM_VIEW_10022005_0612) #define FUSION_SEQUENCE_VIEW_TRANSFORM_VIEW_10022005_0612 -#include -#include +#include +#include #endif diff --git a/include/boost/fusion/view/transform_view/detail/advance_impl.hpp b/include/boost/fusion/sequence/view/transform_view/detail/advance_impl.hpp similarity index 100% rename from include/boost/fusion/view/transform_view/detail/advance_impl.hpp rename to include/boost/fusion/sequence/view/transform_view/detail/advance_impl.hpp diff --git a/include/boost/fusion/view/transform_view/detail/apply_transform_result.hpp b/include/boost/fusion/sequence/view/transform_view/detail/apply_transform_result.hpp similarity index 100% rename from include/boost/fusion/view/transform_view/detail/apply_transform_result.hpp rename to include/boost/fusion/sequence/view/transform_view/detail/apply_transform_result.hpp diff --git a/include/boost/fusion/view/transform_view/detail/at_impl.hpp b/include/boost/fusion/sequence/view/transform_view/detail/at_impl.hpp similarity index 96% rename from include/boost/fusion/view/transform_view/detail/at_impl.hpp rename to include/boost/fusion/sequence/view/transform_view/detail/at_impl.hpp index 620d96fe..eb48cfa0 100644 --- a/include/boost/fusion/view/transform_view/detail/at_impl.hpp +++ b/include/boost/fusion/sequence/view/transform_view/detail/at_impl.hpp @@ -9,7 +9,7 @@ #define BOOST_FUSION_AT_IMPL_20061029_1946 #include -#include +#include #include namespace boost { namespace fusion { diff --git a/include/boost/fusion/view/transform_view/detail/begin_impl.hpp b/include/boost/fusion/sequence/view/transform_view/detail/begin_impl.hpp similarity index 96% rename from include/boost/fusion/view/transform_view/detail/begin_impl.hpp rename to include/boost/fusion/sequence/view/transform_view/detail/begin_impl.hpp index 75b04382..b5f4bc29 100644 --- a/include/boost/fusion/view/transform_view/detail/begin_impl.hpp +++ b/include/boost/fusion/sequence/view/transform_view/detail/begin_impl.hpp @@ -7,7 +7,7 @@ #if !defined(FUSION_BEGIN_IMPL_07162005_1031) #define FUSION_BEGIN_IMPL_07162005_1031 -#include +#include namespace boost { namespace fusion { diff --git a/include/boost/fusion/view/transform_view/detail/deref_impl.hpp b/include/boost/fusion/sequence/view/transform_view/detail/deref_impl.hpp similarity index 96% rename from include/boost/fusion/view/transform_view/detail/deref_impl.hpp rename to include/boost/fusion/sequence/view/transform_view/detail/deref_impl.hpp index 3849f80a..d466cfd3 100644 --- a/include/boost/fusion/view/transform_view/detail/deref_impl.hpp +++ b/include/boost/fusion/sequence/view/transform_view/detail/deref_impl.hpp @@ -10,7 +10,7 @@ #include #include #include -#include +#include namespace boost { namespace fusion { diff --git a/include/boost/fusion/view/transform_view/detail/distance_impl.hpp b/include/boost/fusion/sequence/view/transform_view/detail/distance_impl.hpp similarity index 100% rename from include/boost/fusion/view/transform_view/detail/distance_impl.hpp rename to include/boost/fusion/sequence/view/transform_view/detail/distance_impl.hpp diff --git a/include/boost/fusion/view/transform_view/detail/end_impl.hpp b/include/boost/fusion/sequence/view/transform_view/detail/end_impl.hpp similarity index 96% rename from include/boost/fusion/view/transform_view/detail/end_impl.hpp rename to include/boost/fusion/sequence/view/transform_view/detail/end_impl.hpp index 465a2cbe..a689d933 100644 --- a/include/boost/fusion/view/transform_view/detail/end_impl.hpp +++ b/include/boost/fusion/sequence/view/transform_view/detail/end_impl.hpp @@ -7,7 +7,7 @@ #if !defined(FUSION_END_IMPL_07162005_1028) #define FUSION_END_IMPL_07162005_1028 -#include +#include namespace boost { namespace fusion { diff --git a/include/boost/fusion/view/transform_view/detail/equal_to_impl.hpp b/include/boost/fusion/sequence/view/transform_view/detail/equal_to_impl.hpp similarity index 100% rename from include/boost/fusion/view/transform_view/detail/equal_to_impl.hpp rename to include/boost/fusion/sequence/view/transform_view/detail/equal_to_impl.hpp diff --git a/include/boost/fusion/view/transform_view/detail/next_impl.hpp b/include/boost/fusion/sequence/view/transform_view/detail/next_impl.hpp similarity index 100% rename from include/boost/fusion/view/transform_view/detail/next_impl.hpp rename to include/boost/fusion/sequence/view/transform_view/detail/next_impl.hpp diff --git a/include/boost/fusion/view/transform_view/detail/prior_impl.hpp b/include/boost/fusion/sequence/view/transform_view/detail/prior_impl.hpp similarity index 100% rename from include/boost/fusion/view/transform_view/detail/prior_impl.hpp rename to include/boost/fusion/sequence/view/transform_view/detail/prior_impl.hpp diff --git a/include/boost/fusion/view/transform_view/detail/value_at_impl.hpp b/include/boost/fusion/sequence/view/transform_view/detail/value_at_impl.hpp similarity index 95% rename from include/boost/fusion/view/transform_view/detail/value_at_impl.hpp rename to include/boost/fusion/sequence/view/transform_view/detail/value_at_impl.hpp index cb581583..cc5bbf46 100644 --- a/include/boost/fusion/view/transform_view/detail/value_at_impl.hpp +++ b/include/boost/fusion/sequence/view/transform_view/detail/value_at_impl.hpp @@ -9,7 +9,7 @@ #define BOOST_FUSION_VALUE_AT_IMPL_20061101_0745 #include -#include +#include #include namespace boost { namespace fusion { diff --git a/include/boost/fusion/view/transform_view/detail/value_of_impl.hpp b/include/boost/fusion/sequence/view/transform_view/detail/value_of_impl.hpp similarity index 95% rename from include/boost/fusion/view/transform_view/detail/value_of_impl.hpp rename to include/boost/fusion/sequence/view/transform_view/detail/value_of_impl.hpp index 08bbf209..28e9942c 100644 --- a/include/boost/fusion/view/transform_view/detail/value_of_impl.hpp +++ b/include/boost/fusion/sequence/view/transform_view/detail/value_of_impl.hpp @@ -9,7 +9,7 @@ #include #include -#include +#include namespace boost { namespace fusion { diff --git a/include/boost/fusion/view/transform_view/transform_view.hpp b/include/boost/fusion/sequence/view/transform_view/transform_view.hpp similarity index 89% rename from include/boost/fusion/view/transform_view/transform_view.hpp rename to include/boost/fusion/sequence/view/transform_view/transform_view.hpp index 27ddc273..853bdf61 100644 --- a/include/boost/fusion/view/transform_view/transform_view.hpp +++ b/include/boost/fusion/sequence/view/transform_view/transform_view.hpp @@ -11,12 +11,12 @@ #include #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include #include diff --git a/include/boost/fusion/view/transform_view/transform_view_fwd.hpp b/include/boost/fusion/sequence/view/transform_view/transform_view_fwd.hpp similarity index 100% rename from include/boost/fusion/view/transform_view/transform_view_fwd.hpp rename to include/boost/fusion/sequence/view/transform_view/transform_view_fwd.hpp diff --git a/include/boost/fusion/view/transform_view/transform_view_iterator.hpp b/include/boost/fusion/sequence/view/transform_view/transform_view_iterator.hpp similarity index 79% rename from include/boost/fusion/view/transform_view/transform_view_iterator.hpp rename to include/boost/fusion/sequence/view/transform_view/transform_view_iterator.hpp index bb4b6afd..4d63f7e0 100644 --- a/include/boost/fusion/view/transform_view/transform_view_iterator.hpp +++ b/include/boost/fusion/sequence/view/transform_view/transform_view_iterator.hpp @@ -1,7 +1,7 @@ /*============================================================================= 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_TRANSFORM_VIEW_ITERATOR_07162005_1033) @@ -10,14 +10,13 @@ #include #include #include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include namespace boost { namespace fusion { diff --git a/include/boost/fusion/view/zip_view.hpp b/include/boost/fusion/sequence/view/zip_view.hpp similarity index 79% rename from include/boost/fusion/view/zip_view.hpp rename to include/boost/fusion/sequence/view/zip_view.hpp index f7a16ea0..74f71421 100644 --- a/include/boost/fusion/view/zip_view.hpp +++ b/include/boost/fusion/sequence/view/zip_view.hpp @@ -8,7 +8,7 @@ #if !defined(FUSION_ZIP_VIEW_23012006_0811) #define FUSION_ZIP_VIEW_23012006_0811 -#include -#include +#include +#include #endif diff --git a/include/boost/fusion/view/zip_view/detail/advance_impl.hpp b/include/boost/fusion/sequence/view/zip_view/detail/advance_impl.hpp similarity index 96% rename from include/boost/fusion/view/zip_view/detail/advance_impl.hpp rename to include/boost/fusion/sequence/view/zip_view/detail/advance_impl.hpp index 9aa00deb..36da0444 100644 --- a/include/boost/fusion/view/zip_view/detail/advance_impl.hpp +++ b/include/boost/fusion/sequence/view/zip_view/detail/advance_impl.hpp @@ -8,7 +8,7 @@ #if !defined(FUSION_ADVANCE_IMPL_20061024_2021) #define FUSION_ADVANCE_IMPL_20061024_2021 -#include +#include #include #include #include diff --git a/include/boost/fusion/view/zip_view/detail/at_impl.hpp b/include/boost/fusion/sequence/view/zip_view/detail/at_impl.hpp similarity index 96% rename from include/boost/fusion/view/zip_view/detail/at_impl.hpp rename to include/boost/fusion/sequence/view/zip_view/detail/at_impl.hpp index b01b8cfa..d90b5d05 100644 --- a/include/boost/fusion/view/zip_view/detail/at_impl.hpp +++ b/include/boost/fusion/sequence/view/zip_view/detail/at_impl.hpp @@ -8,9 +8,9 @@ #if !defined(FUSION_AT_IMPL_20060124_1933) #define FUSION_AT_IMPL_20060124_1933 -#include +#include #include -#include +#include #include #include #include diff --git a/include/boost/fusion/view/zip_view/detail/begin_impl.hpp b/include/boost/fusion/sequence/view/zip_view/detail/begin_impl.hpp similarity index 97% rename from include/boost/fusion/view/zip_view/detail/begin_impl.hpp rename to include/boost/fusion/sequence/view/zip_view/detail/begin_impl.hpp index 674dea38..c98eb7fc 100644 --- a/include/boost/fusion/view/zip_view/detail/begin_impl.hpp +++ b/include/boost/fusion/sequence/view/zip_view/detail/begin_impl.hpp @@ -9,7 +9,7 @@ #define FUSION_BEGIN_IMPL_20060123_2147 #include -#include +#include #include #include #include diff --git a/include/boost/fusion/view/zip_view/detail/deref_impl.hpp b/include/boost/fusion/sequence/view/zip_view/detail/deref_impl.hpp similarity index 95% rename from include/boost/fusion/view/zip_view/detail/deref_impl.hpp rename to include/boost/fusion/sequence/view/zip_view/detail/deref_impl.hpp index 69cc8825..70b95d55 100644 --- a/include/boost/fusion/view/zip_view/detail/deref_impl.hpp +++ b/include/boost/fusion/sequence/view/zip_view/detail/deref_impl.hpp @@ -8,10 +8,10 @@ #if !defined(FUSION_DEREF_IMPL_20061024_1959) #define FUSION_DEREF_IMPL_20061024_1959 -#include +#include #include #include -#include +#include #include #include #include diff --git a/include/boost/fusion/view/zip_view/detail/distance_impl.hpp b/include/boost/fusion/sequence/view/zip_view/detail/distance_impl.hpp similarity index 100% rename from include/boost/fusion/view/zip_view/detail/distance_impl.hpp rename to include/boost/fusion/sequence/view/zip_view/detail/distance_impl.hpp diff --git a/include/boost/fusion/view/zip_view/detail/end_impl.hpp b/include/boost/fusion/sequence/view/zip_view/detail/end_impl.hpp similarity index 97% rename from include/boost/fusion/view/zip_view/detail/end_impl.hpp rename to include/boost/fusion/sequence/view/zip_view/detail/end_impl.hpp index fa9c31db..a19b5c1f 100644 --- a/include/boost/fusion/view/zip_view/detail/end_impl.hpp +++ b/include/boost/fusion/sequence/view/zip_view/detail/end_impl.hpp @@ -8,7 +8,7 @@ #if !defined(FUSION_END_IMPL_20060123_2208) #define FUSION_END_IMPL_20060123_2208 -#include +#include #include #include #include diff --git a/include/boost/fusion/view/zip_view/detail/equal_to_impl.hpp b/include/boost/fusion/sequence/view/zip_view/detail/equal_to_impl.hpp similarity index 97% rename from include/boost/fusion/view/zip_view/detail/equal_to_impl.hpp rename to include/boost/fusion/sequence/view/zip_view/detail/equal_to_impl.hpp index c3962a63..7def2030 100644 --- a/include/boost/fusion/view/zip_view/detail/equal_to_impl.hpp +++ b/include/boost/fusion/sequence/view/zip_view/detail/equal_to_impl.hpp @@ -8,7 +8,7 @@ #if !defined(FUSION_EQUAL_TO_IMPL_20060128_1423) #define FUSION_EQUAL_TO_IMPL_20060128_1423 -#include +#include #include #include diff --git a/include/boost/fusion/view/zip_view/detail/next_impl.hpp b/include/boost/fusion/sequence/view/zip_view/detail/next_impl.hpp similarity index 97% rename from include/boost/fusion/view/zip_view/detail/next_impl.hpp rename to include/boost/fusion/sequence/view/zip_view/detail/next_impl.hpp index 1c9c0245..cae95eec 100644 --- a/include/boost/fusion/view/zip_view/detail/next_impl.hpp +++ b/include/boost/fusion/sequence/view/zip_view/detail/next_impl.hpp @@ -8,7 +8,7 @@ #if !defined(FUSION_NEXT_IMPL_20060124_2006) #define FUSION_NEXT_IMPL_20060124_2006 -#include +#include #include #include #include diff --git a/include/boost/fusion/view/zip_view/detail/prior_impl.hpp b/include/boost/fusion/sequence/view/zip_view/detail/prior_impl.hpp similarity index 97% rename from include/boost/fusion/view/zip_view/detail/prior_impl.hpp rename to include/boost/fusion/sequence/view/zip_view/detail/prior_impl.hpp index 49b99397..787eb4f9 100644 --- a/include/boost/fusion/view/zip_view/detail/prior_impl.hpp +++ b/include/boost/fusion/sequence/view/zip_view/detail/prior_impl.hpp @@ -8,7 +8,7 @@ #if !defined(FUSION_PRIOR_IMPL_20060124_2006) #define FUSION_PRIOR_IMPL_20060124_2006 -#include +#include #include #include #include diff --git a/include/boost/fusion/view/zip_view/detail/size_impl.hpp b/include/boost/fusion/sequence/view/zip_view/detail/size_impl.hpp similarity index 100% rename from include/boost/fusion/view/zip_view/detail/size_impl.hpp rename to include/boost/fusion/sequence/view/zip_view/detail/size_impl.hpp diff --git a/include/boost/fusion/view/zip_view/detail/strictest_traversal.hpp b/include/boost/fusion/sequence/view/zip_view/detail/strictest_traversal.hpp similarity index 92% rename from include/boost/fusion/view/zip_view/detail/strictest_traversal.hpp rename to include/boost/fusion/sequence/view/zip_view/detail/strictest_traversal.hpp index e74ffbfc..60abb57c 100644 --- a/include/boost/fusion/view/zip_view/detail/strictest_traversal.hpp +++ b/include/boost/fusion/sequence/view/zip_view/detail/strictest_traversal.hpp @@ -2,7 +2,7 @@ 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) ==============================================================================*/ #if !defined(FUSION_STRICTEST_TRAVERSAL_20060123_2101) @@ -11,13 +11,13 @@ #include #include #include -#include +#include #include #include #include -namespace boost { namespace fusion -{ +namespace boost { namespace fusion { + struct forward_traversal_tag; struct bidirectional_traversal_tag; struct random_access_traversal_tag; @@ -58,7 +58,7 @@ namespace boost { namespace fusion template struct strictest_traversal : result_of::fold< - Sequence, fusion::random_access_traversal_tag, + Sequence, fusion::random_access_traversal_tag, strictest_traversal_impl> {}; diff --git a/include/boost/fusion/view/zip_view/detail/value_at_impl.hpp b/include/boost/fusion/sequence/view/zip_view/detail/value_at_impl.hpp similarity index 97% rename from include/boost/fusion/view/zip_view/detail/value_at_impl.hpp rename to include/boost/fusion/sequence/view/zip_view/detail/value_at_impl.hpp index 7905b063..ed5475ba 100644 --- a/include/boost/fusion/view/zip_view/detail/value_at_impl.hpp +++ b/include/boost/fusion/sequence/view/zip_view/detail/value_at_impl.hpp @@ -8,7 +8,7 @@ #if !defined(FUSION_VALUE_AT_IMPL_20060124_2129) #define FUSION_VALUE_AT_IMPL_20060124_2129 -#include +#include #include #include #include diff --git a/include/boost/fusion/view/zip_view/detail/value_of_impl.hpp b/include/boost/fusion/sequence/view/zip_view/detail/value_of_impl.hpp similarity index 93% rename from include/boost/fusion/view/zip_view/detail/value_of_impl.hpp rename to include/boost/fusion/sequence/view/zip_view/detail/value_of_impl.hpp index 4ba4c3c5..9ea84a17 100644 --- a/include/boost/fusion/view/zip_view/detail/value_of_impl.hpp +++ b/include/boost/fusion/sequence/view/zip_view/detail/value_of_impl.hpp @@ -2,13 +2,13 @@ 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) ==============================================================================*/ #if !defined(FUSION_VALUE_OF_IMPL_20060124_2147) #define FUSION_VALUE_OF_IMPL_20060124_2147 -#include +#include #include #include #include @@ -17,8 +17,8 @@ #include #include -namespace boost { namespace fusion -{ +namespace boost { namespace fusion { + struct zip_view_iterator_tag; namespace detail diff --git a/include/boost/fusion/view/zip_view/zip_view.hpp b/include/boost/fusion/sequence/view/zip_view/zip_view.hpp similarity index 87% rename from include/boost/fusion/view/zip_view/zip_view.hpp rename to include/boost/fusion/sequence/view/zip_view/zip_view.hpp index 5f152eb0..563d853f 100644 --- a/include/boost/fusion/view/zip_view/zip_view.hpp +++ b/include/boost/fusion/sequence/view/zip_view/zip_view.hpp @@ -11,17 +11,17 @@ #include #include #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include #include #include -#include +#include #include #include diff --git a/include/boost/fusion/view/zip_view/zip_view_iterator.hpp b/include/boost/fusion/sequence/view/zip_view/zip_view_iterator.hpp similarity index 65% rename from include/boost/fusion/view/zip_view/zip_view_iterator.hpp rename to include/boost/fusion/sequence/view/zip_view/zip_view_iterator.hpp index 66b514dc..d4ebcc58 100644 --- a/include/boost/fusion/view/zip_view/zip_view_iterator.hpp +++ b/include/boost/fusion/sequence/view/zip_view/zip_view_iterator.hpp @@ -8,17 +8,17 @@ #if !defined(FUSION_ZIP_VIEW_ITERATOR_23012006_0814) #define FUSION_ZIP_VIEW_ITERATOR_23012006_0814 -#include +#include #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include -#include +#include namespace boost { namespace fusion { diff --git a/include/boost/fusion/view/zip_view/zip_view_iterator_fwd.hpp b/include/boost/fusion/sequence/view/zip_view/zip_view_iterator_fwd.hpp similarity index 89% rename from include/boost/fusion/view/zip_view/zip_view_iterator_fwd.hpp rename to include/boost/fusion/sequence/view/zip_view/zip_view_iterator_fwd.hpp index 6edf4d68..6e8bf3f2 100644 --- a/include/boost/fusion/view/zip_view/zip_view_iterator_fwd.hpp +++ b/include/boost/fusion/sequence/view/zip_view/zip_view_iterator_fwd.hpp @@ -8,7 +8,7 @@ #if !defined(FUSION_ZIP_VIEW_ITERATOR_FWD) #define FUSION_ZIP_VIEW_ITERATOR_FWD -#include +#include namespace boost { namespace fusion { diff --git a/include/boost/fusion/support/deduce_sequence.hpp b/include/boost/fusion/support/deduce_sequence.hpp index 9cf97922..41ecbd1b 100644 --- a/include/boost/fusion/support/deduce_sequence.hpp +++ b/include/boost/fusion/support/deduce_sequence.hpp @@ -1,7 +1,7 @@ /*============================================================================= Copyright (c) 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). ==============================================================================*/ @@ -10,8 +10,8 @@ #define BOOST_FUSION_SUPPORT_DEDUCE_SEQUENCE_HPP_INCLUDED #include -#include -#include +#include +#include #include namespace boost { namespace fusion { namespace traits @@ -29,7 +29,7 @@ namespace boost { namespace fusion { namespace traits }; } - // We cannot use fusion::transform_view here as result_of loses cv qualifiers + // We cannot use fusion::transform_view here as result_of looses cv qualifiers // on built in types template struct deduce_sequence diff --git a/include/boost/fusion/support/detail/compiler_config.hpp b/include/boost/fusion/support/detail/compiler_config.hpp new file mode 100644 index 00000000..3859ef78 --- /dev/null +++ b/include/boost/fusion/support/detail/compiler_config.hpp @@ -0,0 +1,17 @@ +/*============================================================================= + 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(FUSION_COMPILER_CONFIG_01052006_1200) +#define FUSION_COMPILER_CONFIG_01052006_1200 + +#include +#include + +#if BOOST_WORKAROUND(BOOST_MSVC, BOOST_TESTED_AT(1310)) +#pragma warning(disable : 4512 4244 4100 4305) +#endif + +#endif diff --git a/include/boost/fusion/support/iterator_base.hpp b/include/boost/fusion/support/iterator_base.hpp index 2f909b2e..39d05c40 100644 --- a/include/boost/fusion/support/iterator_base.hpp +++ b/include/boost/fusion/support/iterator_base.hpp @@ -1,12 +1,14 @@ /*============================================================================= 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_ITERATOR_BASE_05042005_1008) #define FUSION_ITERATOR_BASE_05042005_1008 +#include + namespace boost { namespace fusion { struct iterator_root {}; diff --git a/include/boost/fusion/support/pair.hpp b/include/boost/fusion/support/pair.hpp index cf285714..67758071 100644 --- a/include/boost/fusion/support/pair.hpp +++ b/include/boost/fusion/support/pair.hpp @@ -2,12 +2,13 @@ Copyright (c) 2005 Joel de Guzman Copyright (c) 2006 Tobias Schwinger - 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_PAIR_07222005_1203) #define FUSION_PAIR_07222005_1203 +#include #include #include @@ -22,7 +23,7 @@ namespace boost { namespace fusion pair(typename detail::call_param::type val) : second(val) {} - + template pair(pair const& rhs) : second(rhs.second) {} @@ -44,7 +45,7 @@ namespace boost { namespace fusion template struct make_pair { - typedef fusion::pair::type> type; }; @@ -83,16 +84,16 @@ namespace boost { namespace fusion is >> p.second; return is; } - + template - inline bool + inline bool operator==(pair const& l, pair const& r) { return l.second == r.second; } template - inline bool + inline bool operator!=(pair const& l, pair const& r) { return l.second != r.second; diff --git a/include/boost/fusion/support/sequence_base.hpp b/include/boost/fusion/support/sequence_base.hpp index 1d436ef1..1a82848d 100644 --- a/include/boost/fusion/support/sequence_base.hpp +++ b/include/boost/fusion/support/sequence_base.hpp @@ -2,12 +2,13 @@ Copyright (c) 2001-2006 Joel de Guzman Copyright (c) 2007 Tobias Schwinger - 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_SEQUENCE_BASE_04182005_0737) #define FUSION_SEQUENCE_BASE_04182005_0737 +#include #include namespace boost { namespace fusion @@ -36,7 +37,7 @@ namespace boost { namespace fusion namespace boost { namespace mpl { // Deliberately break mpl::begin, so it doesn't lie that a Fusion sequence - // is not an MPL sequence by returning mpl::void_. + // is not an MPL sequence by returning mpl::void_. // In other words: Fusion Sequences are always MPL Sequences, but they can // be incompletely defined. template<> struct begin_impl< boost::fusion::fusion_sequence_tag >; diff --git a/include/boost/fusion/support/tag_of.hpp b/include/boost/fusion/support/tag_of.hpp index 209ceeff..a1ccf12d 100644 --- a/include/boost/fusion/support/tag_of.hpp +++ b/include/boost/fusion/support/tag_of.hpp @@ -1,17 +1,17 @@ /*============================================================================= 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_TAG_OF_09232005_0845) #define FUSION_TAG_OF_09232005_0845 -#include #include #include #include #include +#include #include #include #include @@ -26,13 +26,13 @@ namespace boost namespace tuples { struct null_type; - + template < - class T0, class T1, class T2, class T3, class T4, + class T0, class T1, class T2, class T3, class T4, class T5, class T6, class T7, class T8, class T9 > class tuple; - + template struct cons; } @@ -53,7 +53,7 @@ namespace boost { namespace fusion {}; template < - class T0, class T1, class T2, class T3, class T4, + class T0, class T1, class T2, class T3, class T4, class T5, class T6, class T7, class T8, class T9 > struct is_specialized > diff --git a/include/boost/fusion/support/tag_of_fwd.hpp b/include/boost/fusion/support/tag_of_fwd.hpp index e6c883d5..053cacaf 100644 --- a/include/boost/fusion/support/tag_of_fwd.hpp +++ b/include/boost/fusion/support/tag_of_fwd.hpp @@ -2,14 +2,14 @@ Copyright (c) 2001-2006 Joel de Guzman Copyright (c) 2005-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) ==============================================================================*/ #if !defined(BOOST_FUSION_TAG_OF_FWD_31122005_1445) #define BOOST_FUSION_TAG_OF_FWD_31122005_1445 -namespace boost { namespace fusion -{ +namespace boost { namespace fusion { + namespace traits { template diff --git a/include/boost/fusion/support/void.hpp b/include/boost/fusion/support/void.hpp index 7dd11e5c..63275b11 100644 --- a/include/boost/fusion/support/void.hpp +++ b/include/boost/fusion/support/void.hpp @@ -1,14 +1,7 @@ -/*============================================================================= - 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_SUPPORT_VOID_20070706_2125) #define BOOST_FUSION_SUPPORT_VOID_20070706_2125 -namespace boost { namespace fusion -{ +namespace boost { namespace fusion { struct void_ {}; }} diff --git a/include/boost/fusion/tuple/tuple.hpp b/include/boost/fusion/tuple/tuple.hpp index d9860323..a32e6b3e 100644 --- a/include/boost/fusion/tuple/tuple.hpp +++ b/include/boost/fusion/tuple/tuple.hpp @@ -8,7 +8,7 @@ #define FUSION_TUPLE_10032005_0810 #include -#include +#include #include #include #include diff --git a/include/boost/fusion/tuple/tuple_fwd.hpp b/include/boost/fusion/tuple/tuple_fwd.hpp index 1a127cab..f3e660e5 100644 --- a/include/boost/fusion/tuple/tuple_fwd.hpp +++ b/include/boost/fusion/tuple/tuple_fwd.hpp @@ -7,7 +7,7 @@ #if !defined(FUSION_TUPLE_FORWARD_10032005_0956) #define FUSION_TUPLE_FORWARD_10032005_0956 -#include +#include #include namespace boost { namespace fusion