diff --git a/include/boost/type_traits/is_base_and_derived.hpp b/include/boost/type_traits/is_base_and_derived.hpp
index 3d926de..6b5eb58 100644
--- a/include/boost/type_traits/is_base_and_derived.hpp
+++ b/include/boost/type_traits/is_base_and_derived.hpp
@@ -24,8 +24,8 @@ namespace boost {
 
 namespace detail {
 
-#if !defined(__BORLANDC__) \
- && !(defined(__EDG_VERSION__) && __EDG_VERSION__ <= 238)
+#if !BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x570)) \
+ && !BOOST_WORKAROUND(__EDG_VERSION__, <= 238)
                              // The EDG version number is a lower estimate.
                              // It is not currently known which EDG version
                              // exactly fixes the problem.