Ticket #2676: djw_result_of_codegear.patch

boost/utility/detail/result_of_iterate.hpp

@@ -1 +1 @@
 // Boost result_of library
 
-//  Copyright Douglas Gregor 2004. Use, modification and
+//  Copyright Douglas Gregor and Daniel Walker 2004-2009. Use, modification and
 //  distribution is subject to the Boost Software License, Version
 //  1.0. (See accompanying file LICENSE_1_0.txt or copy at
 //  http://www.boost.org/LICENSE_1_0.txt)
@@ -10 +10 @@
 # error Boost result_of - do not include this file!
 #endif
 
-#if defined(BOOST_HAS_DECLTYPE)
+#if (!defined(BOOST_HAS_DECLTYPE) \
+     || BOOST_WORKAROUND(__CODEGEARC__, BOOST_TESTED_AT(0x610)))
+#  define BOOST_NO_ISO_RESULT_OF 1
+#endif
 
+#if !defined(BOOST_NO_ISO_RESULT_OF)
+
 // As of N2588, C++0x result_of only supports function call
 // expressions of the form f(x). This precludes support for member
 // function pointers, which are invoked with expressions of the form
@@ -49 +54 @@
 
 } // namespace detail 
 
-#else // defined(BOOST_HAS_DECLTYPE)
+#else // !defined(BOOST_NO_ISO_RESULT_OF)
 
 // CWPro8 requires an argument in a function type specialization
 #if BOOST_WORKAROUND(__MWERKS__, BOOST_TESTED_AT(0x3002)) && BOOST_PP_ITERATION() == 0

boost/utility/result_of.hpp

@@ -92 +92 @@
 
 #else
 #  define BOOST_NO_RESULT_OF 1
+#  define BOOST_NO_ISO_RESULT_OF 1
 #endif
 
 }

libs/utility/utility.htm

@@ -154 +154 @@
                 ...,t<em>N</em>)</code>. The implementation permits
                 the type <code>F</code> to be a function pointer,
                 function reference, member function pointer, or class
-                type.</p> <p>If your compiler does not support
-                <code>decltype</code>, then when <code>F</code> is a
+                type.</p> <p>If your compiler cannot support the ISO
+                draft specification of <code>result_of</code>, 
+                <a href="http://www.open-std.org/JTC1/sc22/wg21/docs/papers/2008/n2798.pdf">N2798</a> 20.7.4,
+                then the macro <code>BOOST_NO_ISO_RESULT_OF</code> is
+                defined, and the following protocol is followed to
+                determine the type of call expressions.
+                When <code>F</code> is a
                 class type with a member type <code>result_type</code>,
                 <code>result_of&lt;F(T1, T2, ...,
                 T<em>N</em>)&gt;</code> is

libs/utility/test/result_of_test.cpp

@@ -1 +1 @@
 // Boost result_of library
 
-//  Copyright Douglas Gregor 2003-2004. Use, modification and
+//  Copyright Douglas Gregor and Daniel Walker 2003-2009. Use, modification and
 //  distribution is subject to the Boost Software License, Version
 //  1.0. (See accompanying file LICENSE_1_0.txt or copy at
 //  http://www.boost.org/LICENSE_1_0.txt)
@@ -133 +133 @@
 
   // Prior to decltype, result_of could not deduce the return type
   // nullary function objects unless they exposed a result_type.
-#if defined(BOOST_HAS_DECLTYPE)
+#if defined(BOOST_NO_ISO_RESULT_OF)
+  BOOST_STATIC_ASSERT((is_same<result_of<int_result_of(void)>::type, void>::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_of_template<void>(void)>::type, void>::value));
+  BOOST_STATIC_ASSERT((is_same<result_of<volatile int_result_of_template<void>(void)>::type, void>::value));
+#else
   BOOST_STATIC_ASSERT((is_same<result_of<int_result_of(void)>::type, int>::value));
   BOOST_STATIC_ASSERT((is_same<result_of<volatile int_result_of(void)>::type, int>::value));
   BOOST_STATIC_ASSERT((is_same<result_of<int_result_of_template<void>(void)>::type, int>::value));
   BOOST_STATIC_ASSERT((is_same<result_of<volatile int_result_of_template<void>(void)>::type, int>::value));
-#else
-  BOOST_STATIC_ASSERT((is_same<result_of<int_result_of(void)>::type, void>::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_of_template<void>(void)>::type, void>::value));
-  BOOST_STATIC_ASSERT((is_same<result_of<volatile int_result_of_template<void>(void)>::type, void>::value));
 #endif
 
   // Prior to decltype, result_of ignored a nested result<> if
   // result_type was defined. After decltype, result_of deduces the
   // actual return type of the function object, ignoring both
   // result<> and result_type.
-#if defined(BOOST_HAS_DECLTYPE)
+#if defined(BOOST_NO_ISO_RESULT_OF)
+  BOOST_STATIC_ASSERT((is_same<result_of<int_result_type_and_float_result_of_and_char_return(char)>::type, int>::value));
+  BOOST_STATIC_ASSERT((is_same<result_of<int_result_type_and_float_result_of_and_char_return_template<void>(char)>::type, int>::value));
+#else
   BOOST_STATIC_ASSERT((is_same<result_of<int_result_type_and_float_result_of_and_char_return(char)>::type, char>::value));
   BOOST_STATIC_ASSERT((is_same<result_of<int_result_type_and_float_result_of_and_char_return_template<void>(char)>::type, char>::value));
-#else
-  BOOST_STATIC_ASSERT((is_same<result_of<int_result_type_and_float_result_of_and_char_return(char)>::type, int>::value));
-  BOOST_STATIC_ASSERT((is_same<result_of<int_result_type_and_float_result_of_and_char_return_template<void>(char)>::type, int>::value));
 #endif
 
   BOOST_STATIC_ASSERT((is_same<result_of<func_ptr(char, float)>::type, int>::value));
@@ -181 +181 @@
   BOOST_STATIC_ASSERT((is_same<result_of<pf_t(int)>::type, int>::value));
   BOOST_STATIC_ASSERT((is_same<result_of<pf_t const(int)>::type,int>::value));
 
-#if defined(BOOST_HAS_DECLTYPE)
+#if !defined(BOOST_NO_ISO_RESULT_OF)
   BOOST_STATIC_ASSERT((is_same<result_of<no_result_type_or_result_of(double)>::type, int>::value));
   BOOST_STATIC_ASSERT((is_same<result_of<no_result_type_or_result_of(void)>::type, unsigned int>::value));
   BOOST_STATIC_ASSERT((is_same<result_of<const no_result_type_or_result_of(double)>::type, short>::value));