[Boost-commit] svn:boost r80712 - in trunk/boost/utility: . detail

Subject: [Boost-commit] svn:boost r80712 - in trunk/boost/utility: . detail
From: eric_at_[hidden]
Date: 2012-09-26 14:47:09

Author: eric_niebler
Date: 2012-09-26 14:47:08 EDT (Wed, 26 Sep 2012)
New Revision: 80712
URL: http://svn.boost.org/trac/boost/changeset/80712

Log:
remove workaround for gcc-4.4, boost.config is correct now
Text files modified: 
   trunk/boost/utility/detail/result_of_iterate.hpp |     6 +++---                                  
   trunk/boost/utility/result_of.hpp                |    12 +++---------                            
   2 files changed, 6 insertions(+), 12 deletions(-)

Modified: trunk/boost/utility/detail/result_of_iterate.hpp
==============================================================================
--- trunk/boost/utility/detail/result_of_iterate.hpp	(original)
+++ trunk/boost/utility/detail/result_of_iterate.hpp	2012-09-26 14:47:08 EDT (Wed, 26 Sep 2012)
@@ -56,7 +56,7 @@
 
 namespace detail {
 
-#ifdef BOOST_RESULT_OF_NO_SFINAE_EXPR
+#ifdef BOOST_NO_SFINAE_EXPR
 
 template<typename F>
 struct BOOST_PP_CAT(result_of_callable_fun_2_, BOOST_PP_ITERATION());
@@ -119,7 +119,7 @@
   ) type;
 };
 
-#else // BOOST_RESULT_OF_NO_SFINAE_EXPR
+#else // BOOST_NO_SFINAE_EXPR
 
 template<typename F BOOST_PP_ENUM_TRAILING_PARAMS(BOOST_PP_ITERATION(),typename T)>
 struct cpp0x_result_of_impl<F(BOOST_PP_ENUM_PARAMS(BOOST_PP_ITERATION(),T)),
@@ -135,7 +135,7 @@
   ) type;
 };
 
-#endif // BOOST_RESULT_OF_NO_SFINAE_EXPR
+#endif // BOOST_NO_SFINAE_EXPR
 
 } // namespace detail
 

Modified: trunk/boost/utility/result_of.hpp
==============================================================================
--- trunk/boost/utility/result_of.hpp	(original)
+++ trunk/boost/utility/result_of.hpp	2012-09-26 14:47:08 EDT (Wed, 26 Sep 2012)
@@ -54,10 +54,6 @@
 #  endif
 #endif
 
-#if defined(BOOST_NO_SFINAE_EXPR) || (BOOST_WORKAROUND(__GNUC__, == 4) && __GNUC_MINOR__ < 5)
-#  define BOOST_RESULT_OF_NO_SFINAE_EXPR
-#endif
-
 namespace boost {
 
 template<typename F> struct result_of;
@@ -70,9 +66,7 @@
 
 template<typename F, typename FArgs, bool HasResultType> struct tr1_result_of_impl;
 
-#ifdef BOOST_RESULT_OF_NO_SFINAE_EXPR
-
-template<typename T> T result_of_decay(T);
+#ifdef BOOST_NO_SFINAE_EXPR
 
 struct result_of_private_type {};
 
@@ -122,7 +116,7 @@
 
 template<typename F, bool TestCallability = true> struct cpp0x_result_of_impl;
 
-#else // BOOST_RESULT_OF_NO_SFINAE_EXPR
+#else // BOOST_NO_SFINAE_EXPR
 
 template<typename T>
 struct result_of_always_void
@@ -132,7 +126,7 @@
 
 template<typename F, typename Enable = void> struct cpp0x_result_of_impl {};
 
-#endif // BOOST_RESULT_OF_NO_SFINAE_EXPR
+#endif // BOOST_NO_SFINAE_EXPR
 
 template<typename F>
 struct result_of_void_impl