[Boost-commit] svn:boost r42811 - trunk/boost/iostreams/detail

From: technews_at_[hidden]
Date: 2008-01-15 20:14:05

Author: turkanis
Date: 2008-01-15 20:14:04 EST (Tue, 15 Jan 2008)
New Revision: 42811
URL: http://svn.boost.org/trac/boost/changeset/42811

Log:
reverted last change except for doc fixes; regression was result of test runner's local patch
Text files modified: 
   trunk/boost/iostreams/detail/execute.hpp |    10 ++--------                              
   1 files changed, 2 insertions(+), 8 deletions(-)

Modified: trunk/boost/iostreams/detail/execute.hpp
==============================================================================
--- trunk/boost/iostreams/detail/execute.hpp	(original)
+++ trunk/boost/iostreams/detail/execute.hpp	2008-01-15 20:14:04 EST (Tue, 15 Jan 2008)
@@ -33,13 +33,6 @@
 
 #include <boost/config.hpp>
 #include <boost/detail/workaround.hpp>
-#if !defined(BOOST_IOSTREAMS_NO_RESULT_OF) && \
-     defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION) || \
-     defined(BOOST_NO_SFINAE) || \
-     BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x593))
-     /**/
-# define BOOST_IOSTREAMS_NO_RESULT_OF
-#endif
 #include <boost/iostreams/detail/config/limits.hpp>   // MAX_EXECUTE_ARITY
 #include <boost/preprocessor/arithmetic/dec.hpp>
 #include <boost/preprocessor/cat.hpp>
@@ -74,7 +67,8 @@
 // returning void and non-void.
 template< typename Op, 
           typename Result = // VC6.5 workaround.
-              #ifndef BOOST_IOSTREAMS_NO_RESULT_OF
+              #if !defined(BOOST_NO_RESULT_OF) && \
+                  !BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x592))
                   typename boost::result_of<Op()>::type
               #else
                   BOOST_DEDUCED_TYPENAME Op::result_type