From 63cde4d3fd724c3eecba9e38e6f2f3f7fcb508ee Mon Sep 17 00:00:00 2001
From: Eric Niebler <eric@boostpro.com>
Date: Mon, 8 Jan 2007 20:38:51 +0000
Subject: [PATCH] slightly modified implementation works around msvc 7.1/8.0
 compiler bugs

[SVN r36668]
---
 .../utility/detail/result_of_iterate.hpp      | 14 +++++------
 include/boost/utility/result_of.hpp           | 11 ++++-----
 test/result_of_test.cpp                       | 24 +++++++++++++++++++
 3 files changed, 35 insertions(+), 14 deletions(-)

diff --git a/include/boost/utility/detail/result_of_iterate.hpp b/include/boost/utility/detail/result_of_iterate.hpp
index 06c4203..2c148bc 100644
--- a/include/boost/utility/detail/result_of_iterate.hpp
+++ b/include/boost/utility/detail/result_of_iterate.hpp
@@ -21,21 +21,21 @@
 template<typename F BOOST_PP_COMMA_IF(BOOST_PP_ITERATION())
          BOOST_PP_ENUM_PARAMS(BOOST_PP_ITERATION(),typename T)>
 struct result_of<F(BOOST_RESULT_OF_ARGS)>
-    : detail::result_of_impl<F, F(BOOST_RESULT_OF_ARGS)> {};
+    : detail::result_of_impl<F, F(BOOST_RESULT_OF_ARGS), (detail::has_result_type<F>::value)> {};
 #endif
 
 namespace detail {
 
 template<typename R,  typename FArgs BOOST_PP_COMMA_IF(BOOST_PP_ITERATION())
          BOOST_PP_ENUM_PARAMS(BOOST_PP_ITERATION(),typename T)>
-struct result_of_impl<R (*)(BOOST_RESULT_OF_ARGS), FArgs>
+struct result_of_impl<R (*)(BOOST_RESULT_OF_ARGS), FArgs, false>
 {
   typedef R type;
 };
 
 template<typename R,  typename FArgs BOOST_PP_COMMA_IF(BOOST_PP_ITERATION())
          BOOST_PP_ENUM_PARAMS(BOOST_PP_ITERATION(),typename T)>
-struct result_of_impl<R (&)(BOOST_RESULT_OF_ARGS), FArgs>
+struct result_of_impl<R (&)(BOOST_RESULT_OF_ARGS), FArgs, false>
 {
   typedef R type;
 };
@@ -47,7 +47,7 @@ template<typename R, typename FArgs BOOST_PP_COMMA_IF(BOOST_PP_ITERATION())
          BOOST_PP_ENUM_PARAMS(BOOST_PP_ITERATION(),typename T)>
 struct result_of_impl<R (T0::*)
                      (BOOST_PP_ENUM_SHIFTED_PARAMS(BOOST_PP_ITERATION(),T)),
-                 FArgs>
+                 FArgs, false>
 {
   typedef R type;
 };
@@ -57,7 +57,7 @@ template<typename R, typename FArgs BOOST_PP_COMMA_IF(BOOST_PP_ITERATION())
 struct result_of_impl<R (T0::*)
                      (BOOST_PP_ENUM_SHIFTED_PARAMS(BOOST_PP_ITERATION(),T))
                      const,
-                 FArgs>
+                 FArgs, false>
 {
   typedef R type;
 };
@@ -67,7 +67,7 @@ template<typename R, typename FArgs BOOST_PP_COMMA_IF(BOOST_PP_ITERATION())
 struct result_of_impl<R (T0::*)
                      (BOOST_PP_ENUM_SHIFTED_PARAMS(BOOST_PP_ITERATION(),T))
                      volatile,
-                 FArgs>
+                 FArgs, false>
 {
   typedef R type;
 };
@@ -77,7 +77,7 @@ template<typename R, typename FArgs BOOST_PP_COMMA_IF(BOOST_PP_ITERATION())
 struct result_of_impl<R (T0::*)
                      (BOOST_PP_ENUM_SHIFTED_PARAMS(BOOST_PP_ITERATION(),T))
                      const volatile,
-                 FArgs>
+                 FArgs, false>
 {
   typedef R type;
 };
diff --git a/include/boost/utility/result_of.hpp b/include/boost/utility/result_of.hpp
index 4db448e..5c5c3d2 100644
--- a/include/boost/utility/result_of.hpp
+++ b/include/boost/utility/result_of.hpp
@@ -29,28 +29,25 @@ namespace detail {
 
 BOOST_MPL_HAS_XXX_TRAIT_DEF(result_type)
 
-template<typename F, typename FArgs, bool HasResultType> struct get_result_of;
+template<typename F, typename FArgs, bool HasResultType> struct result_of_impl;
 
 template<typename F, typename FArgs>
-struct get_result_of<F, FArgs, true>
+struct result_of_impl<F, FArgs, true>
 {
   typedef typename F::result_type type;
 };
 
 template<typename F, typename FArgs>
-struct get_result_of<F, FArgs, false>
+struct result_of_impl<F, FArgs, false>
   : F::template result<FArgs>
 {};
 
 template<typename F>
-struct get_result_of<F, F(void), false>
+struct result_of_impl<F, F(void), false>
 {
   typedef void type;
 };
 
-template<typename F, typename FArgs>
-struct result_of_impl : get_result_of<F, FArgs, (has_result_type<F>::value)> {};
-
 } // end namespace detail
 
 #define BOOST_PP_ITERATION_PARAMS_1 (3,(0,BOOST_RESULT_OF_NUM_ARGS,<boost/utility/detail/result_of_iterate.hpp>))
diff --git a/test/result_of_test.cpp b/test/result_of_test.cpp
index af7aba2..ea48e73 100644
--- a/test/result_of_test.cpp
+++ b/test/result_of_test.cpp
@@ -24,6 +24,24 @@ struct int_result_type_and_float_result_of
   template<typename F> struct result { typedef float type; };
 };
 
+template<typename T>
+struct int_result_type_template { typedef int result_type; };
+
+template<typename T>
+struct int_result_of_template
+{
+  template<typename F> struct result;
+  template<typename This, typename That> struct result<This(That)> { typedef int type; };
+};
+
+template<typename T>
+struct int_result_type_and_float_result_of_template
+{
+  typedef int result_type;
+  template<typename F> struct result;
+  template<typename This, typename That> struct result<This(That)> { typedef float type; };
+};
+
 struct X {};
 
 int main()
@@ -43,6 +61,12 @@ int main()
   BOOST_STATIC_ASSERT((is_same<result_of<const int_result_of(double)>::type, int>::value));
   BOOST_STATIC_ASSERT((is_same<result_of<volatile int_result_of(void)>::type, void>::value));
   BOOST_STATIC_ASSERT((is_same<result_of<int_result_type_and_float_result_of(char)>::type, int>::value));
+  BOOST_STATIC_ASSERT((is_same<result_of<int_result_type_template<void>(float)>::type, int>::value));
+  BOOST_STATIC_ASSERT((is_same<result_of<int_result_of_template<void>(double)>::type, int>::value));
+  BOOST_STATIC_ASSERT((is_same<result_of<int_result_of_template<void>(void)>::type, void>::value));
+  BOOST_STATIC_ASSERT((is_same<result_of<const int_result_of_template<void>(double)>::type, int>::value));
+  BOOST_STATIC_ASSERT((is_same<result_of<volatile int_result_of_template<void>(void)>::type, void>::value));
+  BOOST_STATIC_ASSERT((is_same<result_of<int_result_type_and_float_result_of_template<void>(char)>::type, int>::value));
   BOOST_STATIC_ASSERT((is_same<result_of<func_ptr(char, float)>::type, int>::value));
   BOOST_STATIC_ASSERT((is_same<result_of<func_ref(char, float)>::type, int>::value));
   BOOST_STATIC_ASSERT((is_same<result_of<mem_func_ptr(X,char)>::type, int>::value));