import quincy beta 17.1.0

[ceph.git] / ceph / src / boost / boost / xpressive / xpressive_fwd.hpp

diff --git a/ceph/src/boost/boost/xpressive/xpressive_fwd.hpp b/ceph/src/boost/boost/xpressive/xpressive_fwd.hpp
index 5babacfe49f72ca596d9ec67ae6b2f7020077bcb..f7281e20acee57bf5d257e5b47aa0e599797eb7c 100644 (file)
--- a/ceph/src/boost/boost/xpressive/xpressive_fwd.hpp
+++ b/ceph/src/boost/boost/xpressive/xpressive_fwd.hpp
@@ -38,8 +38,8 @@
 // Config logic taken from boost/regex/config.hpp
 #ifndef BOOST_XPRESSIVE_HAS_MS_STACK_GUARD
 # if (defined(_WIN32) || defined(_WIN64) || defined(_WINCE))                    \
-     && !defined(__GNUC__)                                                      \
-     && !(defined(__BORLANDC__) && (__BORLANDC__ >= 0x600))                     \
+     && !(defined(__GNUC__) || defined(__BORLANDC__) && defined(__clang__))     \
+     && !(defined(BOOST_BORLANDC) && (BOOST_BORLANDC >= 0x600))                 \
      && !(defined(__MWERKS__) && (__MWERKS__ <= 0x3003))
 #  define BOOST_XPRESSIVE_HAS_MS_STACK_GUARD 1
 # else