Functional: Merge old change to use BOOST_DEDUCED_TYPENAME.

[SVN r70516]
This commit is contained in:
Daniel James
2011-03-24 20:28:33 +00:00
parent 5aa6544dfc
commit 68bfa12696
2 changed files with 4 additions and 4 deletions

View File

@@ -141,7 +141,7 @@ namespace boost
{
template< class Self >
struct forward_adapter_result::apply< Self() >
: boost::result_of< typename c<Self>::t() >
: boost::result_of< BOOST_DEDUCED_TYPENAME c<Self>::t() >
{ };
template< class MD, class F, class FC >
@@ -316,7 +316,7 @@ namespace boost
template< class Self, BOOST_PP_ENUM_PARAMS(N,typename T) >
struct forward_adapter_result::apply< Self(BOOST_PP_ENUM_PARAMS(N,T)) >
: boost::result_of<
typename c<Self>::t(BOOST_PP_ENUM_BINARY_PARAMS(N,
BOOST_DEDUCED_TYPENAME c<Self>::t(BOOST_PP_ENUM_BINARY_PARAMS(N,
typename q<T,>::t& BOOST_PP_INTERCEPT)) >
{ };

View File

@@ -146,7 +146,7 @@ namespace boost
{
template< class Self >
struct lightweight_forward_adapter_result::apply< Self() >
: boost::result_of< typename c<Self>::t() >
: boost::result_of< BOOST_DEDUCED_TYPENAME c<Self>::t() >
{ };
template< class MD, class F, class FC >
@@ -205,7 +205,7 @@ namespace boost
struct lightweight_forward_adapter_result::apply<
Self (BOOST_PP_ENUM_PARAMS(N,T)) >
: boost::result_of<
typename c<Self>::t (BOOST_PP_ENUM_BINARY_PARAMS(N,
BOOST_DEDUCED_TYPENAME c<Self>::t (BOOST_PP_ENUM_BINARY_PARAMS(N,
typename x<T,>::t BOOST_PP_INTERCEPT)) >
{ };