blob: 8cb546464373bd1265a4d702644d64ecc8288d28 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
|
--- boost/config/workaround.hpp
+++ boost/config/workaround.hpp
@@ -264,6 +264,10 @@
#else
#define BOOST_CLANG_VERSION_WORKAROUND_GUARD 0
#endif
+
+#if !defined BOOST_LIBSTDCXX_VERSION_WORKAROUND_GUARD
+#define BOOST_LIBSTDCXX_VERSION_WORKAROUND_GUARD 0
+#endif
// Always define to zero, if it's used it'll be defined my MPL:
#define BOOST_MPL_CFG_GCC_WORKAROUND_GUARD 0
--- boost/locale/detail/facet_id.hpp
+++ boost/locale/detail/facet_id.hpp
@@ -12,7 +12,7 @@
/// \cond INTERNAL
namespace boost { namespace locale { namespace detail {
-#if BOOST_CLANG_VERSION >= 40900
+#if defined BOOST_CLANG_VERSION && BOOST_CLANG_VERSION >= 40900
# pragma clang diagnostic push
# pragma clang diagnostic ignored "-Wundefined-var-template"
#endif
@@ -25,7 +25,7 @@
struct BOOST_LOCALE_DECL facet_id {
static std::locale::id id;
};
-#if BOOST_CLANG_VERSION >= 40900
+#if defined BOOST_CLANG_VERSION && BOOST_CLANG_VERSION >= 40900
# pragma clang diagnostic pop
#endif
}}} // namespace boost::locale::detail
|
