From 15b7cb1e8a0e5178ce56fbd37688a5291b6766a9 Mon Sep 17 00:00:00 2001
From: Christopher Kohlhoff <chris@kohlhoff.com>
Date: Thu, 9 Oct 2008 06:28:39 +0000
Subject: [PATCH] Merge codegear changes from non-boost version of asio.

[SVN r49197]
---
 include/boost/asio/read_until.hpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/include/boost/asio/read_until.hpp b/include/boost/asio/read_until.hpp
index 30959a9c..6144e60c 100644
--- a/include/boost/asio/read_until.hpp
+++ b/include/boost/asio/read_until.hpp
@@ -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 @@ namespace detail
     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 @@ namespace detail
     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