[Boost-commit] svn:boost r80550 - trunk/boost/utility/detail

Subject: [Boost-commit] svn:boost r80550 - trunk/boost/utility/detail
From: daniel.j.walker_at_[hidden]
Date: 2012-09-16 20:04:55

Author: djwalker
Date: 2012-09-16 20:04:55 EDT (Sun, 16 Sep 2012)
New Revision: 80550
URL: http://svn.boost.org/trac/boost/changeset/80550

Log:
reverting [78195] in result_of_iterate.hpp to allow users to force result_of to use decltype
Text files modified: 
   trunk/boost/utility/detail/result_of_iterate.hpp |     6 +++---                                  
   1 files changed, 3 insertions(+), 3 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-16 20:04:55 EDT (Sun, 16 Sep 2012)
@@ -38,7 +38,7 @@
             (boost::detail::has_result_type<F>::value)> >::type { };
 #endif
 
-#if !defined(BOOST_NO_DECLTYPE) && defined(BOOST_RESULT_OF_USE_DECLTYPE)
+#ifdef BOOST_RESULT_OF_USE_DECLTYPE
 
 // Uses declval following N3225 20.7.7.6 when F is not a pointer.
 template<typename F BOOST_PP_COMMA_IF(BOOST_PP_ITERATION())
@@ -71,7 +71,7 @@
 
 } // namespace detail 
 
-#else // !defined(BOOST_NO_DECLTYPE) && defined(BOOST_RESULT_OF_USE_DECLTYPE)
+#else // defined(BOOST_RESULT_OF_USE_DECLTYPE)
 
 #if !BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x551))
 template<typename F BOOST_PP_COMMA_IF(BOOST_PP_ITERATION())
@@ -80,7 +80,7 @@
     : tr1_result_of<F(BOOST_RESULT_OF_ARGS)> { };
 #endif
 
-#endif // !defined(BOOST_NO_DECLTYPE) && defined(BOOST_RESULT_OF_USE_DECLTYPE)
+#endif // defined(BOOST_RESULT_OF_USE_DECLTYPE)
 
 #undef BOOST_RESULT_OF_ARGS