From 68bfa12696efed2df5f6f3574a422fe663862875 Mon Sep 17 00:00:00 2001
From: Daniel James <daniel@calamity.org.uk>
Date: Thu, 24 Mar 2011 20:28:33 +0000
Subject: [PATCH] Functional: Merge old change to use `BOOST_DEDUCED_TYPENAME`.

[SVN r70516]
---
 include/boost/functional/forward_adapter.hpp             | 4 ++--
 include/boost/functional/lightweight_forward_adapter.hpp | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/boost/functional/forward_adapter.hpp b/include/boost/functional/forward_adapter.hpp
index c6e61a9..796abd2 100644
--- a/include/boost/functional/forward_adapter.hpp
+++ b/include/boost/functional/forward_adapter.hpp
@@ -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)) >
         { };
 
diff --git a/include/boost/functional/lightweight_forward_adapter.hpp b/include/boost/functional/lightweight_forward_adapter.hpp
index d21ac42..637aa9e 100644
--- a/include/boost/functional/lightweight_forward_adapter.hpp
+++ b/include/boost/functional/lightweight_forward_adapter.hpp
@@ -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)) >
         { };