[Boost-commit] svn:boost r70516 - in branches/release: boost/functional boost/functional/hash libs/functional libs/functional/hash

Subject: [Boost-commit] svn:boost r70516 - in branches/release: boost/functional boost/functional/hash libs/functional libs/functional/hash
From: dnljms_at_[hidden]
Date: 2011-03-24 16:28:33

Author: danieljames
Date: 2011-03-24 16:28:33 EDT (Thu, 24 Mar 2011)
New Revision: 70516
URL: http://svn.boost.org/trac/boost/changeset/70516

Log:
Functional: Merge old change to use `BOOST_DEDUCED_TYPENAME`.

Properties modified: 
   branches/release/boost/functional/   (props changed)
   branches/release/boost/functional/hash/   (props changed)
   branches/release/libs/functional/   (props changed)
   branches/release/libs/functional/hash/   (props changed)
Text files modified: 
   branches/release/boost/functional/forward_adapter.hpp             |     4 ++--                                    
   branches/release/boost/functional/lightweight_forward_adapter.hpp |     4 ++--                                    
   2 files changed, 4 insertions(+), 4 deletions(-)

Modified: branches/release/boost/functional/forward_adapter.hpp
==============================================================================
--- branches/release/boost/functional/forward_adapter.hpp	(original)
+++ branches/release/boost/functional/forward_adapter.hpp	2011-03-24 16:28:33 EDT (Thu, 24 Mar 2011)
@@ -141,7 +141,7 @@
     {
         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 @@
         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)) >
         { };
 

Modified: branches/release/boost/functional/lightweight_forward_adapter.hpp
==============================================================================
--- branches/release/boost/functional/lightweight_forward_adapter.hpp	(original)
+++ branches/release/boost/functional/lightweight_forward_adapter.hpp	2011-03-24 16:28:33 EDT (Thu, 24 Mar 2011)
@@ -146,7 +146,7 @@
     {
         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 @@
         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)) >
         { };