diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2017-06-12 10:13:41 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2017-06-12 10:13:41 +0200 |
| commit | 8fed8299772feaa65d21a76f7fd3051f76a971d6 (patch) | |
| tree | ff854eea46e4c8409cc56b3d88585bed8ecfa2eb /build2 | |
| parent | b67c93f4794b06b57b9601b96421289acadadc6b (diff) | |
Extend workaround version checks to VC15u3 (19.11)
Diffstat (limited to 'build2')
| -rw-r--r-- | build2/function.hxx | 2 | ||||
| -rw-r--r-- | build2/test/script/regex.hxx | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/build2/function.hxx b/build2/function.hxx index 9abd4ef..0e592b1 100644 --- a/build2/function.hxx +++ b/build2/function.hxx @@ -119,7 +119,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 <= 1910) || \ +#if !((defined(_MSC_VER) && _MSC_VER <= 1911) || \ (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 d4f1cf5..801dc09 100644 --- a/build2/test/script/regex.hxx +++ b/build2/test/script/regex.hxx @@ -425,7 +425,7 @@ namespace std // template <> class ctype<build2::test::script::regex::line_char>: public ctype_base -#if !defined(_MSC_VER) || _MSC_VER > 1910 +#if !defined(_MSC_VER) || _MSC_VER > 1911 , public locale::facet #endif { @@ -438,7 +438,7 @@ namespace std static locale::id id; -#if !defined(_MSC_VER) || _MSC_VER > 1910 +#if !defined(_MSC_VER) || _MSC_VER > 1911 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 <= 1910 +#if defined(_MSC_VER) && _MSC_VER <= 1911 static const ctype_base::mask _Ch_upper = ctype_base::upper; static const ctype_base::mask _Ch_alpha = ctype_base::alpha; |