merge from trunk

[SVN r47204]
This commit is contained in:
Joel de Guzman
2008-07-08 02:39:55 +00:00
parent d150ba8498
commit 099deb4385
28 changed files with 30 additions and 30 deletions

View File

@ -8,7 +8,7 @@
#if !defined(BOOST_FUSION_CATEGORY_OF_IMPL_27122005_1044) #if !defined(BOOST_FUSION_CATEGORY_OF_IMPL_27122005_1044)
#define BOOST_FUSION_CATEGORY_OF_IMPL_27122005_1044 #define BOOST_FUSION_CATEGORY_OF_IMPL_27122005_1044
#include <utility> #include <boost/config/no_tr1/utility.hpp>
namespace boost { namespace fusion { namespace boost { namespace fusion {

View File

@ -25,7 +25,7 @@ namespace boost { namespace fusion
namespace traits namespace traits
{ {
template<typename T, std::size_t N> template<typename T, std::size_t N>
#if defined(BOOST_PARTIAL_SPECIALIZATION_EXPLICT_ARGS) #if defined(BOOST_NO_PARTIAL_SPECIALIZATION_IMPLICIT_DEFAULT_ARGS)
struct tag_of<boost::array<T,N>, void > struct tag_of<boost::array<T,N>, void >
#else #else
struct tag_of<boost::array<T,N> > struct tag_of<boost::array<T,N> >

View File

@ -33,7 +33,7 @@ namespace boost { namespace fusion
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 T5, class T6, class T7, class T8, class T9
> >
#if defined(BOOST_PARTIAL_SPECIALIZATION_EXPLICT_ARGS) #if defined(BOOST_NO_PARTIAL_SPECIALIZATION_IMPLICIT_DEFAULT_ARGS)
struct tag_of<tuples::tuple<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9>, void > struct tag_of<tuples::tuple<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9>, void >
#else #else
struct tag_of<tuples::tuple<T0, T1, T2, T3, T4, T5, T6, T7, T8, T9> > 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> template <class Head, class Tail>
#if defined(BOOST_PARTIAL_SPECIALIZATION_EXPLICT_ARGS) #if defined(BOOST_NO_PARTIAL_SPECIALIZATION_IMPLICIT_DEFAULT_ARGS)
struct tag_of<tuples::cons<Head, Tail>, void > struct tag_of<tuples::cons<Head, Tail>, void >
#else #else
struct tag_of<tuples::cons<Head, Tail> > struct tag_of<tuples::cons<Head, Tail> >

View File

@ -11,7 +11,7 @@
#include <boost/fusion/support/tag_of_fwd.hpp> #include <boost/fusion/support/tag_of_fwd.hpp>
#include <boost/fusion/adapted/struct.hpp> #include <boost/fusion/adapted/struct.hpp>
#include <boost/mpl/int.hpp> #include <boost/mpl/int.hpp>
#include <utility> #include <boost/config/no_tr1/utility.hpp>
namespace boost { namespace fusion namespace boost { namespace fusion
{ {
@ -20,7 +20,7 @@ namespace boost { namespace fusion
namespace traits namespace traits
{ {
template <typename T1, typename T2> template <typename T1, typename T2>
#if defined(BOOST_PARTIAL_SPECIALIZATION_EXPLICT_ARGS) #if defined(BOOST_NO_PARTIAL_SPECIALIZATION_IMPLICIT_DEFAULT_ARGS)
struct tag_of<std::pair<T1, T2>, void > struct tag_of<std::pair<T1, T2>, void >
#else #else
struct tag_of<std::pair<T1, T2> > struct tag_of<std::pair<T1, T2> >

View File

@ -8,7 +8,7 @@
#if !defined(BOOST_FUSION_CATEGORY_OF_IMPL_24122005_1731) #if !defined(BOOST_FUSION_CATEGORY_OF_IMPL_24122005_1731)
#define BOOST_FUSION_CATEGORY_OF_IMPL_24122005_1731 #define BOOST_FUSION_CATEGORY_OF_IMPL_24122005_1731
#include <utility> #include <boost/config/no_tr1/utility.hpp>
namespace boost { namespace fusion { namespace boost { namespace fusion {

View File

@ -14,7 +14,7 @@
#include <boost/mpl/if.hpp> #include <boost/mpl/if.hpp>
#include <boost/mpl/int.hpp> #include <boost/mpl/int.hpp>
#include <boost/mpl/minus.hpp> #include <boost/mpl/minus.hpp>
#include <utility> #include <boost/config/no_tr1/utility.hpp>
namespace boost { namespace fusion namespace boost { namespace fusion
{ {

View File

@ -10,7 +10,7 @@
#include <boost/fusion/support/tag_of_fwd.hpp> #include <boost/fusion/support/tag_of_fwd.hpp>
#include <utility> #include <boost/config/no_tr1/utility.hpp>
namespace boost { namespace fusion { namespace boost { namespace fusion {

View File

@ -31,7 +31,7 @@
#include <boost/preprocessor/repetition/enum_params.hpp> #include <boost/preprocessor/repetition/enum_params.hpp>
#include <boost/preprocessor/cat.hpp> #include <boost/preprocessor/cat.hpp>
#include <boost/mpl/int.hpp> #include <boost/mpl/int.hpp>
#include <utility> #include <boost/config/no_tr1/utility.hpp>
namespace boost { namespace fusion { namespace extension { namespace boost { namespace fusion { namespace extension {
template<typename Struct, typename Key> template<typename Struct, typename Key>

View File

@ -27,7 +27,7 @@
#include <boost/preprocessor/repetition/enum_params.hpp> #include <boost/preprocessor/repetition/enum_params.hpp>
#include <boost/preprocessor/cat.hpp> #include <boost/preprocessor/cat.hpp>
#include <boost/mpl/int.hpp> #include <boost/mpl/int.hpp>
#include <utility> #include <boost/config/no_tr1/utility.hpp>
#define BOOST_FUSION_ADAPT_STRUCT(name, bseq) \ #define BOOST_FUSION_ADAPT_STRUCT(name, bseq) \
BOOST_FUSION_ADAPT_STRUCT_I( \ BOOST_FUSION_ADAPT_STRUCT_I( \

View File

@ -8,7 +8,7 @@
#if !defined(BOOST_FUSION_CATEGORY_OF_IMPL_24122005_1731) #if !defined(BOOST_FUSION_CATEGORY_OF_IMPL_24122005_1731)
#define BOOST_FUSION_CATEGORY_OF_IMPL_24122005_1731 #define BOOST_FUSION_CATEGORY_OF_IMPL_24122005_1731
#include <utility> #include <boost/config/no_tr1/utility.hpp>
namespace boost { namespace fusion namespace boost { namespace fusion
{ {

View File

@ -17,7 +17,7 @@
#include <boost/mpl/if.hpp> #include <boost/mpl/if.hpp>
#include <boost/mpl/int.hpp> #include <boost/mpl/int.hpp>
#include <boost/mpl/minus.hpp> #include <boost/mpl/minus.hpp>
#include <utility> #include <boost/config/no_tr1/utility.hpp>
namespace boost { namespace fusion namespace boost { namespace fusion
{ {

View File

@ -22,7 +22,7 @@ namespace boost { namespace fusion
}; };
template <typename Sequence, typename F> template <typename Sequence, typename F>
#if defined(BOOST_PARTIAL_SPECIALIZATION_EXPLICT_ARGS) #if defined(BOOST_NO_PARTIAL_SPECIALIZATION_IMPLICIT_DEFAULT_ARGS)
struct transform<Sequence, F, void_> struct transform<Sequence, F, void_>
#else #else
struct transform<Sequence, F> struct transform<Sequence, F>

View File

@ -54,7 +54,7 @@ namespace boost { namespace fusion {
namespace result_of namespace result_of
{ {
template< BOOST_PP_ENUM_PARAMS(ZIP_ITERATION, typename T) > template< BOOST_PP_ENUM_PARAMS(ZIP_ITERATION, typename T) >
#if defined(BOOST_PARTIAL_SPECIALIZATION_EXPLICT_ARGS) #if defined(BOOST_NO_PARTIAL_SPECIALIZATION_IMPLICIT_DEFAULT_ARGS)
#define TEXT(z, n, text) , text #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_) > 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 #undef TEXT

View File

@ -54,7 +54,7 @@ namespace boost { namespace fusion
namespace result_of namespace result_of
{ {
template <BOOST_PP_ENUM_PARAMS(N, typename T)> template <BOOST_PP_ENUM_PARAMS(N, typename T)>
#if defined(BOOST_PARTIAL_SPECIALIZATION_EXPLICT_ARGS) #if defined(BOOST_NO_PARTIAL_SPECIALIZATION_IMPLICIT_DEFAULT_ARGS)
#define TEXT(z, n, text) , text #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_) > 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 #undef TEXT

View File

@ -54,7 +54,7 @@ namespace boost { namespace fusion
namespace result_of namespace result_of
{ {
template <BOOST_PP_ENUM_PARAMS(N, typename T)> template <BOOST_PP_ENUM_PARAMS(N, typename T)>
#if defined(BOOST_PARTIAL_SPECIALIZATION_EXPLICT_ARGS) #if defined(BOOST_NO_PARTIAL_SPECIALIZATION_IMPLICIT_DEFAULT_ARGS)
#define TEXT(z, n, text) , text #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_) > 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 #undef TEXT

View File

@ -73,7 +73,7 @@ namespace boost { namespace fusion
namespace result_of namespace result_of
{ {
template <BOOST_PP_ENUM_PARAMS(N, typename T)> template <BOOST_PP_ENUM_PARAMS(N, typename T)>
#if defined(BOOST_PARTIAL_SPECIALIZATION_EXPLICT_ARGS) #if defined(BOOST_NO_PARTIAL_SPECIALIZATION_IMPLICIT_DEFAULT_ARGS)
#define TEXT(z, n, text) , text #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_) > 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 #undef TEXT

View File

@ -66,7 +66,7 @@ namespace boost { namespace fusion
namespace result_of namespace result_of
{ {
template <BOOST_PP_ENUM_PARAMS(N, typename T)> template <BOOST_PP_ENUM_PARAMS(N, typename T)>
#if defined(BOOST_PARTIAL_SPECIALIZATION_EXPLICT_ARGS) #if defined(BOOST_NO_PARTIAL_SPECIALIZATION_IMPLICIT_DEFAULT_ARGS)
#define TEXT(z, n, text) , text #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_) > 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 #undef TEXT

View File

@ -78,7 +78,7 @@ namespace boost { namespace fusion
BOOST_PP_ENUM_PARAMS(N, typename K) BOOST_PP_ENUM_PARAMS(N, typename K)
, BOOST_PP_ENUM_PARAMS(N, typename D) , BOOST_PP_ENUM_PARAMS(N, typename D)
> >
#if defined(BOOST_PARTIAL_SPECIALIZATION_EXPLICT_ARGS) #if defined(BOOST_NO_PARTIAL_SPECIALIZATION_IMPLICIT_DEFAULT_ARGS)
#define TEXT(z, n, text) , text #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_)> 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 #undef TEXT

View File

@ -68,7 +68,7 @@ namespace boost { namespace fusion
namespace result_of namespace result_of
{ {
template <BOOST_PP_ENUM_PARAMS(N, typename T)> template <BOOST_PP_ENUM_PARAMS(N, typename T)>
#if defined(BOOST_PARTIAL_SPECIALIZATION_EXPLICT_ARGS) #if defined(BOOST_NO_PARTIAL_SPECIALIZATION_IMPLICIT_DEFAULT_ARGS)
#define TEXT(z, n, text) , text #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_) > 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 #undef TEXT

View File

@ -66,7 +66,7 @@ namespace boost { namespace fusion
namespace result_of namespace result_of
{ {
template <BOOST_PP_ENUM_PARAMS(N, typename T)> template <BOOST_PP_ENUM_PARAMS(N, typename T)>
#if defined(BOOST_PARTIAL_SPECIALIZATION_EXPLICT_ARGS) #if defined(BOOST_NO_PARTIAL_SPECIALIZATION_IMPLICIT_DEFAULT_ARGS)
#define TEXT(z, n, text) , text #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_) > 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 #undef TEXT

View File

@ -81,7 +81,7 @@ namespace boost { namespace fusion
BOOST_PP_ENUM_PARAMS(N, typename K) BOOST_PP_ENUM_PARAMS(N, typename K)
, BOOST_PP_ENUM_PARAMS(N, typename D) , BOOST_PP_ENUM_PARAMS(N, typename D)
> >
#if defined(BOOST_PARTIAL_SPECIALIZATION_EXPLICT_ARGS) #if defined(BOOST_NO_PARTIAL_SPECIALIZATION_IMPLICIT_DEFAULT_ARGS)
#define TEXT(z, n, text) , text #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_)> 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_)>

View File

@ -53,7 +53,7 @@ namespace boost { namespace fusion
namespace result_of namespace result_of
{ {
template <BOOST_PP_ENUM_PARAMS(N, typename T)> template <BOOST_PP_ENUM_PARAMS(N, typename T)>
#if defined(BOOST_PARTIAL_SPECIALIZATION_EXPLICT_ARGS) #if defined(BOOST_NO_PARTIAL_SPECIALIZATION_IMPLICIT_DEFAULT_ARGS)
#define TEXT(z, n, text) , text #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_) > 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 #undef TEXT

View File

@ -39,7 +39,7 @@ namespace boost { namespace fusion
type; type;
static type static type
call(Sequence& t) call(Sequence&)
{ {
return type(); return type();
} }

View File

@ -1,5 +1,5 @@
/*============================================================================= /*=============================================================================
Copyright (c) 2005-2006 Joao Abecasis Copyright (c) 2005-2006 João Abecasis
Copyright (c) 2006-2007 Tobias Schwinger Copyright (c) 2006-2007 Tobias Schwinger
Use modification and distribution are subject to the Boost Software Use modification and distribution are subject to the Boost Software

View File

@ -1,5 +1,5 @@
/*============================================================================= /*=============================================================================
Copyright (c) 2005-2006 Joao Abecasis Copyright (c) 2005-2006 João Abecasis
Copyright (c) 2006-2007 Tobias Schwinger Copyright (c) 2006-2007 Tobias Schwinger
Use modification and distribution are subject to the Boost Software Use modification and distribution are subject to the Boost Software

View File

@ -1,5 +1,5 @@
/*============================================================================= /*=============================================================================
Copyright (c) 2005-2006 Joao Abecasis Copyright (c) 2005-2006 João Abecasis
Copyright (c) 2006-2007 Tobias Schwinger Copyright (c) 2006-2007 Tobias Schwinger
Use modification and distribution are subject to the Boost Software Use modification and distribution are subject to the Boost Software

View File

@ -16,7 +16,7 @@
#include <boost/mpl/assert.hpp> #include <boost/mpl/assert.hpp>
#include <boost/mpl/bool.hpp> #include <boost/mpl/bool.hpp>
#include <boost/mpl/if.hpp> #include <boost/mpl/if.hpp>
#include <utility> #include <boost/config/no_tr1/utility.hpp>
namespace boost namespace boost
{ {

View File

@ -73,7 +73,7 @@ namespace boost { namespace fusion
// Unary Version // Unary Version
template <typename Sequence, typename F> template <typename Sequence, typename F>
#if defined(BOOST_PARTIAL_SPECIALIZATION_EXPLICT_ARGS) #if defined(BOOST_NO_PARTIAL_SPECIALIZATION_IMPLICIT_DEFAULT_ARGS)
struct transform_view<Sequence, F, void_> : sequence_base<transform_view<Sequence, F, void_> > struct transform_view<Sequence, F, void_> : sequence_base<transform_view<Sequence, F, void_> >
#else #else
struct transform_view<Sequence, F> : sequence_base<transform_view<Sequence, F> > struct transform_view<Sequence, F> : sequence_base<transform_view<Sequence, F> >