diff options
Diffstat (limited to 'boost/wave/wave_config.hpp')
| -rw-r--r-- | boost/wave/wave_config.hpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/boost/wave/wave_config.hpp b/boost/wave/wave_config.hpp index ec712ef16d..bd29a8a89d 100644 --- a/boost/wave/wave_config.hpp +++ b/boost/wave/wave_config.hpp @@ -186,7 +186,9 @@ #endif #if BOOST_WAVE_SUPPORT_THREADING != 0 -#define BOOST_SPIRIT_THREADSAFE 1 +#ifndef BOOST_SPIRIT_THREADSAFE +#define BOOST_SPIRIT_THREADSAFE +#endif #define PHOENIX_THREADSAFE 1 #else // disable thread support in Boost.Pool @@ -202,8 +204,7 @@ // VC7 isn't able to compile the flex_string class, fall back to std::string // CW up to 8.3 chokes as well *sigh* // Tru64/CXX has linker problems when using flex_string -#if BOOST_WORKAROUND(BOOST_MSVC, <= 1300) || \ - BOOST_WORKAROUND(__MWERKS__, < 0x3200) || \ +#if BOOST_WORKAROUND(__MWERKS__, < 0x3200) || \ (defined(__DECCXX) && defined(__alpha)) || \ defined(BOOST_WAVE_STRINGTYPE_USE_STDSTRING) @@ -228,7 +229,7 @@ // BOOST_WAVE_STRINGTYPE above. #include <boost/wave/util/flex_string.hpp> -#endif // BOOST_WORKAROUND(_MSC_VER, <= 1300) et.al. +#endif // BOOST_WORKAROUND(__MWERKS__, < 0x3200) et.al. #endif // !defined(BOOST_WAVE_STRINGTYPE) /////////////////////////////////////////////////////////////////////////////// |