Merge from trunk

[SVN r79274]
This commit is contained in:
Joel de Guzman
2012-07-05 04:40:37 +00:00
parent bcb5fd9618
commit 5a51e5d9aa
58 changed files with 1566 additions and 183 deletions

12
include/boost/fusion/functional/adapter/unfused.hpp Executable file → Normal file
View File

@ -100,6 +100,7 @@ namespace boost { namespace fusion
namespace boost
{
#if !defined(BOOST_RESULT_OF_USE_DECLTYPE) || defined(BOOST_NO_DECLTYPE)
template<class F>
struct result_of< boost::fusion::unfused<F> const () >
{
@ -110,6 +111,17 @@ namespace boost
{
typedef typename boost::fusion::unfused<F>::call_0_result type;
};
#endif
template<class F>
struct tr1_result_of< boost::fusion::unfused<F> const () >
{
typedef typename boost::fusion::unfused<F>::call_const_0_result type;
};
template<class F>
struct tr1_result_of< boost::fusion::unfused<F>() >
{
typedef typename boost::fusion::unfused<F>::call_0_result type;
};
}
#define BOOST_FUSION_FUNCTIONAL_ADAPTER_UNFUSED_HPP_INCLUDED

View File

@ -80,6 +80,7 @@ namespace boost { namespace fusion
namespace boost
{
#if !defined(BOOST_RESULT_OF_USE_DECLTYPE) || defined(BOOST_NO_DECLTYPE)
template<class F, class Seq>
struct result_of< boost::fusion::unfused_typed<F,Seq> const () >
: boost::fusion::unfused_typed<F,Seq>::template result<
@ -90,6 +91,17 @@ namespace boost
: boost::fusion::unfused_typed<F,Seq>::template result<
boost::fusion::unfused_typed<F,Seq> () >
{ };
#endif
template<class F, class Seq>
struct tr1_result_of< boost::fusion::unfused_typed<F,Seq> const () >
: boost::fusion::unfused_typed<F,Seq>::template result<
boost::fusion::unfused_typed<F,Seq> const () >
{ };
template<class F, class Seq>
struct tr1_result_of< boost::fusion::unfused_typed<F,Seq>() >
: boost::fusion::unfused_typed<F,Seq>::template result<
boost::fusion::unfused_typed<F,Seq> () >
{ };
}