[Boost-commit] svn:boost r42425 - branches/iostreams_dev/boost/iostreams/detail

From: technews_at_[hidden]
Date: 2008-01-02 20:54:52

Author: turkanis
Date: 2008-01-02 20:54:52 EST (Wed, 02 Jan 2008)
New Revision: 42425
URL: http://svn.boost.org/trac/boost/changeset/42425

Log:
applied  the BOOST_NO_RESULT_OF workaround for recent versions of Borland
Text files modified: 
   branches/iostreams_dev/boost/iostreams/detail/execute.hpp |     5 +++--                                   
   1 files changed, 3 insertions(+), 2 deletions(-)

Modified: branches/iostreams_dev/boost/iostreams/detail/execute.hpp
==============================================================================
--- branches/iostreams_dev/boost/iostreams/detail/execute.hpp	(original)
+++ branches/iostreams_dev/boost/iostreams/detail/execute.hpp	2008-01-02 20:54:52 EST (Wed, 02 Jan 2008)
@@ -70,11 +70,12 @@
 // returning void and non-void.
 template< typename Op, 
           typename Result = // VC6.5 workaround.
-              #ifndef BOOST_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
-              #endif 
+              #endif
           >
 struct execute_traits 
     : execute_traits_impl<Result>