Merge.

[SVN r43270]
Merge from trunk.
2025-06-28 13:20:58 +02:00 · 2008-02-16 09:50:01 +00:00 · 2007-12-22 15:36:31 +00:00 · 2007-12-08 15:08:32 +00:00 · 2007-12-08 15:07:44 +00:00 · 2007-12-07 01:12:02 +00:00
45 changed files with 27 additions and 27 deletions
--- a/doc/html/images/alert.png
+++ b/doc/html/images/alert.png
--- a/doc/html/images/home.png
+++ b/doc/html/images/home.png
--- a/doc/html/images/next.png
+++ b/doc/html/images/next.png
--- a/doc/html/images/note.png
+++ b/doc/html/images/note.png
--- a/doc/html/images/prev.png
+++ b/doc/html/images/prev.png
--- a/doc/html/images/smiley.png
+++ b/doc/html/images/smiley.png
--- a/doc/html/images/tip.png
+++ b/doc/html/images/tip.png
--- a/doc/html/images/up.png
+++ b/doc/html/images/up.png
--- a/include/boost/fusion/adapted/array/detail/category_of_impl.hpp
+++ b/include/boost/fusion/adapted/array/detail/category_of_impl.hpp
@ -8,7 +8,7 @@
 #if !defined(BOOST_FUSION_CATEGORY_OF_IMPL_27122005_1044)
 #define BOOST_FUSION_CATEGORY_OF_IMPL_27122005_1044
-#include <boost/config/no_tr1/utility.hpp>
+#include <utility>
 namespace boost { namespace fusion { 
--- a/include/boost/fusion/adapted/array/tag_of.hpp
+++ b/include/boost/fusion/adapted/array/tag_of.hpp
@ -25,7 +25,7 @@ namespace boost { namespace fusion
    namespace traits
    {
        template<typename T, std::size_t N>
-#if defined(BOOST_NO_PARTIAL_SPECIALIZATION_IMPLICIT_DEFAULT_ARGS)
+#if defined(BOOST_PARTIAL_SPECIALIZATION_EXPLICT_ARGS)
        struct tag_of<boost::array<T,N>, void >
 #else
        struct tag_of<boost::array<T,N> >
--- a/include/boost/fusion/adapted/boost_tuple/tag_of.hpp
+++ b/include/boost/fusion/adapted/boost_tuple/tag_of.hpp
@ -33,7 +33,7 @@ namespace boost { namespace fusion
            class T0, class T1, class T2, class T3, class T4, 
            class T5, class T6, class T7, class T8, class T9
        >
-#if defined(BOOST_NO_PARTIAL_SPECIALIZATION_IMPLICIT_DEFAULT_ARGS)
+#if defined(BOOST_PARTIAL_SPECIALIZATION_EXPLICT_ARGS)
        struct tag_of<tuples::tuple<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9>, void >
 #else
        struct tag_of<tuples::tuple<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> >
@ -43,7 +43,7 @@ namespace boost { namespace fusion
        };
        template <class Head, class Tail>
-#if defined(BOOST_NO_PARTIAL_SPECIALIZATION_IMPLICIT_DEFAULT_ARGS)
+#if defined(BOOST_PARTIAL_SPECIALIZATION_EXPLICT_ARGS)
        struct tag_of<tuples::cons<Head, Tail>, void >
 #else
        struct tag_of<tuples::cons<Head, Tail> >
--- a/include/boost/fusion/adapted/std_pair.hpp
+++ b/include/boost/fusion/adapted/std_pair.hpp
@ -11,7 +11,7 @@
 #include <boost/fusion/support/tag_of_fwd.hpp>
 #include <boost/fusion/adapted/struct.hpp>
 #include <boost/mpl/int.hpp>
-#include <boost/config/no_tr1/utility.hpp>
+#include <utility>
 namespace boost { namespace fusion
 {
@ -20,7 +20,7 @@ namespace boost { namespace fusion
    namespace traits
    {
        template <typename T1, typename T2>
-#if defined(BOOST_NO_PARTIAL_SPECIALIZATION_IMPLICIT_DEFAULT_ARGS)
+#if defined(BOOST_PARTIAL_SPECIALIZATION_EXPLICT_ARGS)
        struct tag_of<std::pair<T1, T2>, void >
 #else
        struct tag_of<std::pair<T1, T2> >
--- a/include/boost/fusion/adapted/std_pair/detail/category_of_impl.hpp
+++ b/include/boost/fusion/adapted/std_pair/detail/category_of_impl.hpp
@ -8,7 +8,7 @@
 #if !defined(BOOST_FUSION_CATEGORY_OF_IMPL_24122005_1731)
 #define BOOST_FUSION_CATEGORY_OF_IMPL_24122005_1731
-#include <boost/config/no_tr1/utility.hpp>
+#include <utility>
 namespace boost { namespace fusion { 
--- a/include/boost/fusion/adapted/std_pair/std_pair_iterator.hpp
+++ b/include/boost/fusion/adapted/std_pair/std_pair_iterator.hpp
@ -14,7 +14,7 @@
 #include <boost/mpl/if.hpp>
 #include <boost/mpl/int.hpp>
 #include <boost/mpl/minus.hpp>
-#include <boost/config/no_tr1/utility.hpp>
+#include <utility>
 namespace boost { namespace fusion
 {
--- a/include/boost/fusion/adapted/std_pair/tag_of.hpp
+++ b/include/boost/fusion/adapted/std_pair/tag_of.hpp
@ -10,7 +10,7 @@
 #include <boost/fusion/support/tag_of_fwd.hpp>
-#include <boost/config/no_tr1/utility.hpp>
+#include <utility>
 namespace boost { namespace fusion {
--- a/include/boost/fusion/adapted/struct/adapt_assoc_struct.hpp
+++ b/include/boost/fusion/adapted/struct/adapt_assoc_struct.hpp
@ -31,7 +31,7 @@
 #include <boost/preprocessor/repetition/enum_params.hpp>
 #include <boost/preprocessor/cat.hpp>
 #include <boost/mpl/int.hpp>
-#include <boost/config/no_tr1/utility.hpp>
+#include <utility>
 namespace boost { namespace fusion { namespace extension {
    template<typename Struct, typename Key>
--- a/include/boost/fusion/adapted/struct/adapt_struct.hpp
+++ b/include/boost/fusion/adapted/struct/adapt_struct.hpp
@ -27,7 +27,7 @@
 #include <boost/preprocessor/repetition/enum_params.hpp>
 #include <boost/preprocessor/cat.hpp>
 #include <boost/mpl/int.hpp>
-#include <boost/config/no_tr1/utility.hpp>
+#include <utility>
 #define BOOST_FUSION_ADAPT_STRUCT(name, bseq)                                   \
    BOOST_FUSION_ADAPT_STRUCT_I(                                                \
--- a/include/boost/fusion/adapted/struct/detail/category_of_impl.hpp
+++ b/include/boost/fusion/adapted/struct/detail/category_of_impl.hpp
@ -8,7 +8,7 @@
 #if !defined(BOOST_FUSION_CATEGORY_OF_IMPL_24122005_1731)
 #define BOOST_FUSION_CATEGORY_OF_IMPL_24122005_1731
-#include <boost/config/no_tr1/utility.hpp>
+#include <utility>
 namespace boost { namespace fusion
 {
--- a/include/boost/fusion/adapted/struct/struct_iterator.hpp
+++ b/include/boost/fusion/adapted/struct/struct_iterator.hpp
@ -17,7 +17,7 @@
 #include <boost/mpl/if.hpp>
 #include <boost/mpl/int.hpp>
 #include <boost/mpl/minus.hpp>
-#include <boost/config/no_tr1/utility.hpp>
+#include <utility>
 namespace boost { namespace fusion
 {
--- a/include/boost/fusion/algorithm/iteration/ext_/for_each_s.hpp
+++ b/include/boost/fusion/algorithm/iteration/ext_/for_each_s.hpp
--- a/include/boost/fusion/algorithm/query/ext_/find_if_s.hpp
+++ b/include/boost/fusion/algorithm/query/ext_/find_if_s.hpp
--- a/include/boost/fusion/algorithm/transformation/transform.hpp
+++ b/include/boost/fusion/algorithm/transformation/transform.hpp
@ -22,7 +22,7 @@ namespace boost { namespace fusion
        };
        template <typename Sequence, typename F>
-#if defined(BOOST_NO_PARTIAL_SPECIALIZATION_IMPLICIT_DEFAULT_ARGS)
+#if defined(BOOST_PARTIAL_SPECIALIZATION_EXPLICT_ARGS)
        struct transform<Sequence, F, void_>
 #else
        struct transform<Sequence, F>
--- a/include/boost/fusion/algorithm/transformation/zip.hpp
+++ b/include/boost/fusion/algorithm/transformation/zip.hpp
@ -54,7 +54,7 @@ namespace boost { namespace fusion {
    namespace result_of
    {
        template< BOOST_PP_ENUM_PARAMS(ZIP_ITERATION, typename T) >
-#if defined(BOOST_NO_PARTIAL_SPECIALIZATION_IMPLICIT_DEFAULT_ARGS)
+#if defined(BOOST_PARTIAL_SPECIALIZATION_EXPLICT_ARGS)
        #define TEXT(z, n, text) , text
        struct zip< BOOST_PP_ENUM_PARAMS(ZIP_ITERATION, T) BOOST_PP_REPEAT_FROM_TO(BOOST_PP_DEC(ZIP_ITERATION), FUSION_MAX_ZIP_SEQUENCES, TEXT, void_) >
        #undef TEXT
--- a/include/boost/fusion/container/ext_/tree.hpp
+++ b/include/boost/fusion/container/ext_/tree.hpp
--- a/include/boost/fusion/container/generation/deque_tie.hpp
+++ b/include/boost/fusion/container/generation/deque_tie.hpp
@ -54,7 +54,7 @@ namespace boost { namespace fusion
    namespace result_of
    {
        template <BOOST_PP_ENUM_PARAMS(N, typename T)>
-#if defined(BOOST_NO_PARTIAL_SPECIALIZATION_IMPLICIT_DEFAULT_ARGS)
+#if defined(BOOST_PARTIAL_SPECIALIZATION_EXPLICT_ARGS)
        #define TEXT(z, n, text) , text
        struct deque_tie< BOOST_PP_ENUM_PARAMS(N, T) BOOST_PP_REPEAT_FROM_TO(BOOST_PP_DEC(N), FUSION_MAX_DEQUE_SIZE, TEXT, void_) >
        #undef TEXT
--- a/include/boost/fusion/container/generation/list_tie.hpp
+++ b/include/boost/fusion/container/generation/list_tie.hpp
@ -54,7 +54,7 @@ namespace boost { namespace fusion
    namespace result_of
    {
        template <BOOST_PP_ENUM_PARAMS(N, typename T)>
-#if defined(BOOST_NO_PARTIAL_SPECIALIZATION_IMPLICIT_DEFAULT_ARGS)
+#if defined(BOOST_PARTIAL_SPECIALIZATION_EXPLICT_ARGS)
        #define TEXT(z, n, text) , text
        struct list_tie< BOOST_PP_ENUM_PARAMS(N, T) BOOST_PP_REPEAT_FROM_TO(BOOST_PP_DEC(N), FUSION_MAX_LIST_SIZE, TEXT, void_) >
        #undef TEXT
--- a/include/boost/fusion/container/generation/make_deque.hpp
+++ b/include/boost/fusion/container/generation/make_deque.hpp
@ -73,7 +73,7 @@ namespace boost { namespace fusion
    namespace result_of
    {
        template <BOOST_PP_ENUM_PARAMS(N, typename T)>
-#if defined(BOOST_NO_PARTIAL_SPECIALIZATION_IMPLICIT_DEFAULT_ARGS)
+#if defined(BOOST_PARTIAL_SPECIALIZATION_EXPLICT_ARGS)
        #define TEXT(z, n, text) , text
        struct make_deque< BOOST_PP_ENUM_PARAMS(N, T) BOOST_PP_REPEAT_FROM_TO(BOOST_PP_DEC(N), FUSION_MAX_DEQUE_SIZE, TEXT, void_) >
        #undef TEXT
--- a/include/boost/fusion/container/generation/make_list.hpp
+++ b/include/boost/fusion/container/generation/make_list.hpp
@ -66,7 +66,7 @@ namespace boost { namespace fusion
    namespace result_of
    {
        template <BOOST_PP_ENUM_PARAMS(N, typename T)>
-#if defined(BOOST_NO_PARTIAL_SPECIALIZATION_IMPLICIT_DEFAULT_ARGS)
+#if defined(BOOST_PARTIAL_SPECIALIZATION_EXPLICT_ARGS)
        #define TEXT(z, n, text) , text
        struct make_list< BOOST_PP_ENUM_PARAMS(N, T) BOOST_PP_REPEAT_FROM_TO(BOOST_PP_DEC(N), FUSION_MAX_LIST_SIZE, TEXT, void_) >
        #undef TEXT
--- a/include/boost/fusion/container/generation/make_map.hpp
+++ b/include/boost/fusion/container/generation/make_map.hpp
@ -78,7 +78,7 @@ namespace boost { namespace fusion
            BOOST_PP_ENUM_PARAMS(N, typename K)
          , BOOST_PP_ENUM_PARAMS(N, typename D)
        >
-#if defined(BOOST_NO_PARTIAL_SPECIALIZATION_IMPLICIT_DEFAULT_ARGS)
+#if defined(BOOST_PARTIAL_SPECIALIZATION_EXPLICT_ARGS)
         #define TEXT(z, n, text) , text
         struct make_map<BOOST_PP_ENUM_PARAMS(N, K), BOOST_PP_ENUM_PARAMS(N, D) BOOST_PP_REPEAT_FROM_TO(N, FUSION_MAX_VECTOR_SIZE, TEXT, void_) BOOST_PP_REPEAT_FROM_TO(BOOST_PP_DEC(N), FUSION_MAX_VECTOR_SIZE, TEXT, void_)>
         #undef TEXT
--- a/include/boost/fusion/container/generation/make_set.hpp
+++ b/include/boost/fusion/container/generation/make_set.hpp
@ -68,7 +68,7 @@ namespace boost { namespace fusion
    namespace result_of
    {
        template <BOOST_PP_ENUM_PARAMS(N, typename T)>
-#if defined(BOOST_NO_PARTIAL_SPECIALIZATION_IMPLICIT_DEFAULT_ARGS)
+#if defined(BOOST_PARTIAL_SPECIALIZATION_EXPLICT_ARGS)
        #define TEXT(z, n, text) , text
        struct make_set< BOOST_PP_ENUM_PARAMS(N, T) BOOST_PP_REPEAT_FROM_TO(BOOST_PP_DEC(N), FUSION_MAX_SET_SIZE, TEXT, void_) >
        #undef TEXT
--- a/include/boost/fusion/container/generation/make_vector.hpp
+++ b/include/boost/fusion/container/generation/make_vector.hpp
@ -66,7 +66,7 @@ namespace boost { namespace fusion
    namespace result_of
    {
        template <BOOST_PP_ENUM_PARAMS(N, typename T)>
-#if defined(BOOST_NO_PARTIAL_SPECIALIZATION_IMPLICIT_DEFAULT_ARGS)
+#if defined(BOOST_PARTIAL_SPECIALIZATION_EXPLICT_ARGS)
        #define TEXT(z, n, text) , text
        struct make_vector< BOOST_PP_ENUM_PARAMS(N, T) BOOST_PP_REPEAT_FROM_TO(BOOST_PP_DEC(N), FUSION_MAX_VECTOR_SIZE, TEXT, void_) >
        #undef TEXT
--- a/include/boost/fusion/container/generation/map_tie.hpp
+++ b/include/boost/fusion/container/generation/map_tie.hpp
@ -81,7 +81,7 @@ namespace boost { namespace fusion
            BOOST_PP_ENUM_PARAMS(N, typename K)
          , BOOST_PP_ENUM_PARAMS(N, typename D)
        >
-#if defined(BOOST_NO_PARTIAL_SPECIALIZATION_IMPLICIT_DEFAULT_ARGS)
+#if defined(BOOST_PARTIAL_SPECIALIZATION_EXPLICT_ARGS)
        #define TEXT(z, n, text) , text
        struct map_tie<BOOST_PP_ENUM_PARAMS(N, K), BOOST_PP_ENUM_PARAMS(N, D) BOOST_PP_REPEAT_FROM_TO(N, FUSION_MAX_MAP_SIZE, TEXT, void_) BOOST_PP_REPEAT_FROM_TO(BOOST_PP_DEC(N), FUSION_MAX_MAP_SIZE, TEXT, void_)>
--- a/include/boost/fusion/container/generation/vector_tie.hpp
+++ b/include/boost/fusion/container/generation/vector_tie.hpp
@ -53,7 +53,7 @@ namespace boost { namespace fusion
    namespace result_of
    {
        template <BOOST_PP_ENUM_PARAMS(N, typename T)>
-#if defined(BOOST_NO_PARTIAL_SPECIALIZATION_IMPLICIT_DEFAULT_ARGS)
+#if defined(BOOST_PARTIAL_SPECIALIZATION_EXPLICT_ARGS)
        #define TEXT(z, n, text) , text
        struct vector_tie< BOOST_PP_ENUM_PARAMS(N, T) BOOST_PP_REPEAT_FROM_TO(BOOST_PP_DEC(N), FUSION_MAX_VECTOR_SIZE, TEXT, void_) >
        #undef TEXT
--- a/include/boost/fusion/container/list/detail/end_impl.hpp
+++ b/include/boost/fusion/container/list/detail/end_impl.hpp
@ -39,7 +39,7 @@ namespace boost { namespace fusion
                type;
                static type
-                call(Sequence&)
+                call(Sequence& t)
                {
                    return type();
                }
--- a/include/boost/fusion/sequence/intrinsic/ext_/segments.hpp
+++ b/include/boost/fusion/sequence/intrinsic/ext_/segments.hpp
--- a/include/boost/fusion/sequence/intrinsic/ext_/size_s.hpp
+++ b/include/boost/fusion/sequence/intrinsic/ext_/size_s.hpp
--- a/include/boost/fusion/support/ext_/is_segmented.hpp
+++ b/include/boost/fusion/support/ext_/is_segmented.hpp
--- a/include/boost/fusion/support/tag_of.hpp
+++ b/include/boost/fusion/support/tag_of.hpp
@ -16,7 +16,7 @@
 #include <boost/mpl/assert.hpp>
 #include <boost/mpl/bool.hpp>
 #include <boost/mpl/if.hpp>
-#include <boost/config/no_tr1/utility.hpp>
+#include <utility>
 namespace boost
 {
--- a/include/boost/fusion/view/ext_/multiple_view.hpp
+++ b/include/boost/fusion/view/ext_/multiple_view.hpp
--- a/include/boost/fusion/view/ext_/segmented_iterator.hpp
+++ b/include/boost/fusion/view/ext_/segmented_iterator.hpp
--- a/include/boost/fusion/view/ext_/segmented_iterator_range.hpp
+++ b/include/boost/fusion/view/ext_/segmented_iterator_range.hpp
--- a/include/boost/fusion/view/transform_view/transform_view.hpp
+++ b/include/boost/fusion/view/transform_view/transform_view.hpp
@ -73,7 +73,7 @@ namespace boost { namespace fusion
    // Unary Version
    template <typename Sequence, typename F>
-#if defined(BOOST_NO_PARTIAL_SPECIALIZATION_IMPLICIT_DEFAULT_ARGS)
+#if defined(BOOST_PARTIAL_SPECIALIZATION_EXPLICT_ARGS)
    struct transform_view<Sequence, F, void_> : sequence_base<transform_view<Sequence, F, void_> >
 #else
    struct transform_view<Sequence, F> : sequence_base<transform_view<Sequence, F> >
--- a/test/algorithm/ext_/find_if_s.cpp
+++ b/test/algorithm/ext_/find_if_s.cpp
--- a/test/algorithm/ext_/for_each_s.cpp
+++ b/test/algorithm/ext_/for_each_s.cpp
--- a/test/sequence/ext_/iterator_range_s.cpp
+++ b/test/sequence/ext_/iterator_range_s.cpp
Author	SHA1	Message	Date
Daniel James	07f6832a94	Merge. [SVN r43270]	2008-02-16 09:50:01 +00:00
Daniel James	87586de981	Merge from trunk. [SVN r42243]	2007-12-22 15:36:31 +00:00
Daniel James	47a48f4294	Bring back trunk's generated documentation. [SVN r41875]	2007-12-08 15:08:32 +00:00
Daniel James	0d6cff5ab4	Remove the fusion generated documentation so that I can replace it with the version from trunk. [SVN r41874]	2007-12-08 15:07:44 +00:00
Daniel James	0c1f015c1a	Merge from trunk, finally. [SVN r41817]	2007-12-07 01:12:02 +00:00
Daniel James	59df6ee7f1	Regenerate fusion documentation. [SVN r41607]	2007-12-03 00:09:20 +00:00
Daniel James	df69f05f94	Create a branch to fix links on. [SVN r41573]	2007-12-02 10:07:42 +00:00