Add test macro for handler hook support.

chriskohlhoff · chriskohlhoff · commit 394748486b38 · 2012-05-29T20:11:29.000+10:00
diff --git a/asio/include/asio/detail/config.hpp b/asio/include/asio/detail/config.hpp
@@ -512,4 +512,19 @@
 # endif // defined(ASIO_MSVC) && (ASIO_MSVC >= 1400) && !defined(UNDER_CE)
 #endif // !defined(ASIO_DISABLE_SECURE_RTL)
 
+// Handler hooking. Disabled for ancient Borland C++ and gcc compilers.
+#if !defined(ASIO_DISABLE_HANDLER_HOOKS)
+# if defined(__GNUC__)
+#  if (__GNUC__ >= 3)
+#   if !defined(ASIO_HAS_HANDLER_HOOKS)
+#    define ASIO_HAS_HANDLER_HOOKS 1
+#   endif // !defined(ASIO_HAS_HANDLER_HOOKS)
+#  endif // (__GNUC__ >= 3)
+# elif !defined(__BORLANDC__)
+#  if !defined(ASIO_HAS_HANDLER_HOOKS)
+#   define ASIO_HAS_HANDLER_HOOKS 1
+#  endif // !defined(ASIO_HAS_HANDLER_HOOKS)
+# endif // !defined(__BORLANDC__)
+#endif // !defined(ASIO_DISABLE_HANDLER_HOOKS)
+
 #endif // ASIO_DETAIL_CONFIG_HPP
diff --git a/asio/include/asio/detail/handler_alloc_helpers.hpp b/asio/include/asio/detail/handler_alloc_helpers.hpp
@@ -16,7 +16,6 @@
 #endif // defined(_MSC_VER) && (_MSC_VER >= 1200)
 
 #include "asio/detail/config.hpp"
-#include <boost/detail/workaround.hpp>
 #include "asio/detail/addressof.hpp"
 #include "asio/detail/noncopyable.hpp"
 #include "asio/handler_alloc_hook.hpp"
@@ -31,8 +30,7 @@ namespace asio_handler_alloc_helpers {
 template <typename Handler>
 inline void* allocate(std::size_t s, Handler& h)
 {
-#if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564)) \
-  || BOOST_WORKAROUND(__GNUC__, < 3)
+#if !defined(ASIO_HAS_HANDLER_HOOKS)
   return ::operator new(s);
 #else
   using asio::asio_handler_allocate;
@@ -43,8 +41,7 @@ inline void* allocate(std::size_t s, Handler& h)
 template <typename Handler>
 inline void deallocate(void* p, std::size_t s, Handler& h)
 {
-#if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564)) \
-  || BOOST_WORKAROUND(__GNUC__, < 3)
+#if !defined(ASIO_HAS_HANDLER_HOOKS)
   ::operator delete(p);
 #else
   using asio::asio_handler_deallocate;
diff --git a/asio/include/asio/detail/handler_invoke_helpers.hpp b/asio/include/asio/detail/handler_invoke_helpers.hpp
@@ -16,7 +16,6 @@
 #endif // defined(_MSC_VER) && (_MSC_VER >= 1200)
 
 #include "asio/detail/config.hpp"
-#include <boost/detail/workaround.hpp>
 #include "asio/detail/addressof.hpp"
 #include "asio/handler_invoke_hook.hpp"
 
@@ -30,8 +29,7 @@ namespace asio_handler_invoke_helpers {
 template <typename Function, typename Context>
 inline void invoke(Function& function, Context& context)
 {
-#if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564)) \
-  || BOOST_WORKAROUND(__GNUC__, < 3)
+#if !defined(ASIO_HAS_HANDLER_HOOKS)
   Function tmp(function);
   tmp();
 #else
@@ -43,8 +41,7 @@ inline void invoke(Function& function, Context& context)
 template <typename Function, typename Context>
 inline void invoke(const Function& function, Context& context)
 {
-#if BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x564)) \
-  || BOOST_WORKAROUND(__GNUC__, < 3)
+#if !defined(ASIO_HAS_HANDLER_HOOKS)
   Function tmp(function);
   tmp();
 #else
