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

@ -11,7 +11,7 @@
#include <boost/fusion/support/tag_of_fwd.hpp>
#include <boost/fusion/adapted/struct.hpp>
#include <boost/mpl/int.hpp>
#include <utility>
#include <boost/config/no_tr1/utility.hpp>
namespace boost { namespace fusion
{
@ -20,7 +20,7 @@ namespace boost { namespace fusion
namespace traits
{
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 >
#else
struct tag_of<std::pair<T1, T2> >