[Boost-commit] svn:boost r49197 - trunk/boost/asio

Subject: [Boost-commit] svn:boost r49197 - trunk/boost/asio
From: chris_at_[hidden]
Date: 2008-10-09 02:28:40

Author: chris_kohlhoff
Date: 2008-10-09 02:28:39 EDT (Thu, 09 Oct 2008)
New Revision: 49197
URL: http://svn.boost.org/trac/boost/changeset/49197

Log:
Merge codegear changes from non-boost version of asio.

Text files modified: 
   trunk/boost/asio/read_until.hpp |     7 +++----                                 
   1 files changed, 3 insertions(+), 4 deletions(-)

Modified: trunk/boost/asio/read_until.hpp
==============================================================================
--- trunk/boost/asio/read_until.hpp	(original)
+++ trunk/boost/asio/read_until.hpp	2008-10-09 02:28:39 EDT (Thu, 09 Oct 2008)
@@ -24,14 +24,13 @@
 #include <boost/type_traits/is_function.hpp>
 #include <boost/type_traits/remove_pointer.hpp>
 #include <boost/utility/enable_if.hpp>
+#include <boost/detail/workaround.hpp>
 #include <string>
 #include <boost/asio/detail/pop_options.hpp>
 
 #include <boost/asio/basic_streambuf.hpp>
 #include <boost/asio/error.hpp>
 
-#include <boost/detail/workaround.hpp>
-
 namespace boost {
 namespace asio {
 
@@ -50,7 +49,7 @@
     static const T& ref();
     enum { value = (sizeof((inner<const T&>::helper)((ref)())) == 1) };
   };
-#else
+#else // BOOST_WORKAROUND(__CODEGEARC__, BOOST_TESTED_AT(0x610))
   template <typename T>
   struct has_result_type
   {
@@ -60,7 +59,7 @@
     static const T& ref();
     enum { value = (sizeof((helper)((ref)())) == 1) };
   };
-#endif
+#endif // BOOST_WORKAROUND(__CODEGEARC__, BOOST_TESTED_AT(0x610))
 } // namespace detail
 
 /// Type trait used to determine whether a type can be used as a match condition