[Boost-commit] svn:boost r45895 - branches/proto/v4/boost/proto/detail

From: eric_at_[hidden]
Date: 2008-05-28 23:32:24

Author: eric_niebler
Date: 2008-05-28 23:32:24 EDT (Wed, 28 May 2008)
New Revision: 45895
URL: http://svn.boost.org/trac/boost/changeset/45895

Log:
msvc-friendly return type calculation for member pointers
Text files modified: 
   branches/proto/v4/boost/proto/detail/decltype.hpp |    23 +++++++++++++++--------                 
   1 files changed, 15 insertions(+), 8 deletions(-)

Modified: branches/proto/v4/boost/proto/detail/decltype.hpp
==============================================================================
--- branches/proto/v4/boost/proto/detail/decltype.hpp	(original)
+++ branches/proto/v4/boost/proto/detail/decltype.hpp	2008-05-28 23:32:24 EDT (Wed, 28 May 2008)
@@ -24,6 +24,7 @@
 #include <boost/type_traits/is_member_object_pointer.hpp>
 #include <boost/type_traits/add_const.hpp>
 #include <boost/type_traits/add_reference.hpp>
+#include <boost/function_types/result_type.hpp>
 #include <boost/typeof/typeof.hpp>
 #include <boost/utility/addressof.hpp>
 #include <boost/utility/result_of.hpp>
@@ -206,17 +207,23 @@
         struct result_of_
           : boost::result_of<T>
         {};
+        
+        template<typename T, typename U>
+        struct result_of_<T(U), typename enable_if<is_member_object_pointer<T> >::type>
+          : remove_reference<typename function_types::result_type<T>::type>
+        {};
 
-        template<typename T, typename U, typename V>
-        struct result_of_<T U::*(V), typename disable_if<is_function<typename remove_cv<T>::type> >::type>
-        {
-            typedef T type;
-        };
+        template<typename T, typename U>
+        struct result_of_<T(U &), typename enable_if<is_member_object_pointer<T> >::type>
+          : function_types::result_type<T>
+        {};
 
-        template<typename T, typename U, typename V>
-        struct result_of_<T U::*(V &), typename disable_if<is_function<typename remove_cv<T>::type> >::type>
+        template<typename T, typename U>
+        struct result_of_<T(U const &), typename enable_if<is_member_object_pointer<T> >::type>
         {
-            typedef T &type;
+            typedef typename
+                remove_reference<typename function_types::result_type<T>::type>::type const &
+            type;
         };
 
         ////////////////////////////////////////////////////////////////////////////////////////////