[Boost-commit] svn:boost r80395 - trunk/boost/fusion/functional/invocation

Subject: [Boost-commit] svn:boost r80395 - trunk/boost/fusion/functional/invocation
From: joel_at_[hidden]
Date: 2012-09-04 09:40:39

Author: djowel
Date: 2012-09-04 09:40:38 EDT (Tue, 04 Sep 2012)
New Revision: 80395
URL: http://svn.boost.org/trac/boost/changeset/80395

Log:
Fixed code to allow decltype implementation of boost::result_of with BOOST_RESULT_OF_USE_DECLTYPE defined.
Text files modified: 
   trunk/boost/fusion/functional/invocation/invoke.hpp |    83 +++++++++++++++++++++++++++++++++++---- 
   1 files changed, 74 insertions(+), 9 deletions(-)

Modified: trunk/boost/fusion/functional/invocation/invoke.hpp
==============================================================================
--- trunk/boost/fusion/functional/invocation/invoke.hpp	(original)
+++ trunk/boost/fusion/functional/invocation/invoke.hpp	2012-09-04 09:40:38 EDT (Tue, 04 Sep 2012)
@@ -57,13 +57,13 @@
         template <typename Function, class Sequence> struct invoke;
     }
 
-    template <typename Function, class Sequence>
-    inline typename result_of::invoke<Function, Sequence>::type
-    invoke(Function, Sequence &);
-
-    template <typename Function, class Sequence>
-    inline typename result_of::invoke<Function, Sequence const>::type
-    invoke(Function, Sequence const &);
+    //~ template <typename Function, class Sequence>
+    //~ inline typename result_of::invoke<Function, Sequence>::type
+    //~ invoke(Function, Sequence &);
+
+    //~ template <typename Function, class Sequence>
+    //~ inline typename result_of::invoke<Function, Sequence const>::type
+    //~ invoke(Function, Sequence const &);
 
     //----- ---- --- -- - -  -   -
 
@@ -86,6 +86,9 @@
         struct invoke_data_member;
 
         template <typename Function, class Sequence, int N, bool RandomAccess>
+        struct invoke_fn_ptr;
+
+        template <typename Function, class Sequence, int N, bool RandomAccess>
         struct invoke_mem_fn;
 
         #define  BOOST_PP_FILENAME_1 <boost/fusion/functional/invocation/invoke.hpp>
@@ -95,10 +98,10 @@
         template <typename F, class Sequence, int N, bool RandomAccess>
         struct invoke_nonmember_builtin
         // use same implementation as for function objects but...
-            : invoke_impl< // ...work around boost::result_of bugs
+            : invoke_fn_ptr< // ...work around boost::result_of bugs
                 typename mpl::eval_if< ft::is_function<F>,
                     boost::add_reference<F>, boost::remove_cv<F> >::type,
-                Sequence, N, false, RandomAccess >
+                Sequence, N, RandomAccess >
         { };
 
         template <typename Function, class Sequence, int N, bool RandomAccess>
@@ -221,6 +224,35 @@
 
         };
 
+        template <typename Function, class Sequence>
+        struct invoke_fn_ptr<Function,Sequence,N,true>
+        {
+        public:
+
+            typedef typename ft::result_type<Function>::type result_type;
+
+#if N > 0
+
+            template <typename F>
+            static inline result_type
+            call(F & f, Sequence & s)
+            {
+#define M(z,j,data) fusion::at_c<j>(s)
+                return f( BOOST_PP_ENUM(N,M,~) );
+            }
+
+#else
+            template <typename F>
+            static inline result_type
+            call(F & f, Sequence & /*s*/)
+            {
+                return f();
+            }
+
+#endif
+
+        };
+
 
 #if N > 0
         template <typename Function, class Sequence>
@@ -282,6 +314,39 @@
 
         };
 
+        template <typename Function, class Sequence>
+        struct invoke_fn_ptr<Function,Sequence,N,false>
+        {
+        private:
+            typedef invoke_param_types<Sequence,N> seq;
+        public:
+
+            typedef typename ft::result_type<Function>::type result_type;
+
+#if N > 0
+
+            template <typename F>
+            static inline result_type
+            call(F & f, Sequence & s)
+            {
+                typename seq::I0 i0 = fusion::begin(s);
+                BOOST_PP_REPEAT_FROM_TO(1,N,M,~)
+                return f( BOOST_PP_ENUM_PARAMS(N,*i) );
+            }
+
+#else
+
+            template <typename F>
+            static inline result_type
+            call(F & f, Sequence & /*s*/)
+            {
+                return f();
+            }
+
+#endif
+
+        };
+
 #if N > 0
         template <typename Function, class Sequence>
         struct invoke_mem_fn<Function,Sequence,N,false>