result_of and polymorphic function obj compatibility

[SVN r37962]

test/functional/make_unfused_generic.cpp

@@ -38,7 +38,11 @@ template <class Base = boost::blank, class RemoveNullary = mpl::false_>
 struct test_func
     : Base
 {
-    template <class Seq> struct result
+    template<typename Params>
+    struct result;
+
+    template <typename B, typename RM, class Seq> 
+    struct result<test_func<B, RM>(Seq)>
         : mpl::if_< mpl::and_< fusion::result_of::empty<Seq>, RemoveNullary >, 
                     boost::blank, mpl::identity<long> >::type
     { };
@@ -61,6 +65,8 @@ struct test_func
 
     struct fold_op
     {
+        typedef long result_type;
+
         template <typename T>
         long operator()(T const & elem, long value) const
         {
@@ -73,10 +79,6 @@ struct test_func
           elem += sizeof(T);
           return value;
         }
-
-        template <typename T0, typename T1> struct result
-            : mpl::identity<long>
-        { };
     };
 };