aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKaren Arutyunov <karen@codesynthesis.com>2018-05-18 15:57:30 +0300
committerKaren Arutyunov <karen@codesynthesis.com>2018-05-18 15:57:30 +0300
commit3e4823adaaea81329f0e0dd165cfa6e2f56b62bf (patch)
tree85af1dff671a3ab369a46db351a2d5d0933d8095
parentc50dd6a48fb364e9d9812cc177e08f62c390687a (diff)
Add workarounds for all releases of VC15
-rw-r--r--build2/function.hxx2
-rw-r--r--build2/test/script/regex.hxx6
2 files changed, 4 insertions, 4 deletions
diff --git a/build2/function.hxx b/build2/function.hxx
index dc6a636..ab63b48 100644
--- a/build2/function.hxx
+++ b/build2/function.hxx
@@ -125,7 +125,7 @@ namespace build2
// std::is_pod appears to be broken in VC15 and also in GCC up to
// 5 (pointers to members).
//
-#if !((defined(_MSC_VER) && _MSC_VER <= 1914) || \
+#if !((defined(_MSC_VER) && _MSC_VER < 1920) || \
(defined(__GNUC__) && !defined(__clang__) && __GNUC__ <= 5))
static_assert (std::is_pod<D>::value, "type is not POD");
#endif
diff --git a/build2/test/script/regex.hxx b/build2/test/script/regex.hxx
index 7bbbe98..2850f23 100644
--- a/build2/test/script/regex.hxx
+++ b/build2/test/script/regex.hxx
@@ -424,7 +424,7 @@ namespace std
//
template <>
class ctype<build2::test::script::regex::line_char>: public ctype_base
-#if !defined(_MSC_VER) || _MSC_VER > 1914
+#if !defined(_MSC_VER) || _MSC_VER >= 1920
, public locale::facet
#endif
{
@@ -437,7 +437,7 @@ namespace std
static locale::id id;
-#if !defined(_MSC_VER) || _MSC_VER > 1914
+#if !defined(_MSC_VER) || _MSC_VER >= 1920
explicit
ctype (size_t refs = 0): locale::facet (refs) {}
#else
@@ -520,7 +520,7 @@ namespace std
// Workaround for msvcrt bugs. For some reason it assumes such a members
// to be present in a regex_traits specialization.
//
-#if defined(_MSC_VER) && _MSC_VER <= 1914
+#if defined(_MSC_VER) && _MSC_VER < 1920
static const ctype_base::mask _Ch_upper = ctype_base::upper;
static const ctype_base::mask _Ch_alpha = ctype_base::alpha;