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

@ -22,7 +22,7 @@ namespace boost { namespace fusion
};
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_>
#else
struct transform<Sequence, F>

View File

@ -54,7 +54,7 @@ namespace boost { namespace fusion {
namespace result_of
{
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
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