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)
#define BOOST_FUSION_CATEGORY_OF_IMPL_27122005_1044
#include <utility>
#include <boost/config/no_tr1/utility.hpp>
namespace boost { namespace fusion {

View File

@ -25,7 +25,7 @@ namespace boost { namespace fusion
namespace traits
{
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 >
#else
struct tag_of<boost::array<T,N> >