Ticket #4832: lambda.patch

result_of.hpp

@@ -75 +75 @@
 template<typename F>
 struct is_function_with_no_args<F(void)> : mpl::true_ {};
 
-template<typename F, typename FArgs>
+template<typename F, typename FArgs,typename Unused=void>
 struct result_of_nested_result : F::template result<FArgs>
 {};
 
+#if !defined(BOOST_NO_LAMBDAS)
+#if _MSC_FULL_VER>=160030319
+template<class T>
+struct FP
+{
+        typedef decltype(&T::operator()) type;
+};
+
 template<typename F, typename FArgs>
+struct result_of_nested_result<F,FArgs,
+        typename enable_if<
+                typename is_member_function_pointer<typename FP<F>::type>::type>::type>
+{
+        template<class T>
+        struct extractor;
+
+        template<class R,class T,class A>
+        struct extractor<R (T::*)(A) const>
+        {
+                typedef R type;
+        };
+        
+        typedef typename extractor<typename FP<F>::type>::type type;
+};
+#endif // _MSC_FULL_VER>=0x160030319
+#endif  // !BOOST_NO_LAMBDAS
+
+template<typename F, typename FArgs>
 struct tr1_result_of_impl<F, FArgs, false>
   : mpl::if_<is_function_with_no_args<FArgs>,
              result_of_void_impl<F>,