diff --git a/include/boost/optional.hpp b/include/boost/optional.hpp
index 04b72a1..f75e98e 100644
--- a/include/boost/optional.hpp
+++ b/include/boost/optional.hpp
@@ -271,9 +271,9 @@ bool operator != ( optional<T> const& x, optional<T> const& y )
 //
 namespace optional_detail {
 
-// GCC <= 3.2 gets the using declaration at namespace scope (FLC)
-#if BOOST_WORKAROUND(__GNUC__, <= 3) && __GNUC_MINOR__ <= 2
-   // workaround for GCC (JM):
+// GCC < 3.2 gets the using declaration at namespace scope (FLC, DWA)
+#if BOOST_WORKAROUND(__GNUC__, < 3)                             \
+    || BOOST_WORKAROUND(__GNUC__, == 3) && __GNUC_MINOR__ <= 2
    using std::swap;
 #define BOOST_OPTIONAL_STD_SWAP_INTRODUCED_AT_NS_SCOPE
 #endif