[Boost-commit] svn:boost r78507 - trunk/boost/fusion/functional/adapter

Subject: [Boost-commit] svn:boost r78507 - trunk/boost/fusion/functional/adapter
From: joel_at_[hidden]
Date: 2012-05-18 21:18:44

Author: djowel
Date: 2012-05-18 21:18:43 EDT (Fri, 18 May 2012)
New Revision: 78507
URL: http://svn.boost.org/trac/boost/changeset/78507

Log:
patch for ticket #6910 by michel
Text files modified: 
   trunk/boost/fusion/functional/adapter/unfused.hpp       |    12 ++++++++++++                            
   trunk/boost/fusion/functional/adapter/unfused_typed.hpp |    12 ++++++++++++                            
   2 files changed, 24 insertions(+), 0 deletions(-)

Modified: trunk/boost/fusion/functional/adapter/unfused.hpp
==============================================================================
--- trunk/boost/fusion/functional/adapter/unfused.hpp	(original)
+++ trunk/boost/fusion/functional/adapter/unfused.hpp	2012-05-18 21:18:43 EDT (Fri, 18 May 2012)
@@ -100,6 +100,7 @@
 
 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 @@
     {
         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

Modified: trunk/boost/fusion/functional/adapter/unfused_typed.hpp
==============================================================================
--- trunk/boost/fusion/functional/adapter/unfused_typed.hpp	(original)
+++ trunk/boost/fusion/functional/adapter/unfused_typed.hpp	2012-05-18 21:18:43 EDT (Fri, 18 May 2012)
@@ -80,6 +80,7 @@
 
 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 @@
         : 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> () >
+    { };
 }