diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2018-04-13 14:55:51 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2018-04-13 14:55:51 +0200 |
| commit | 84e26884cbbc692062c20798fc12cd90ca4383c4 (patch) | |
| tree | 037f778e767c2cb0c131b5753db7726b2504ff56 | |
| parent | 866ab9d8cbda5b82be3578cc959e56ef548809ff (diff) | |
Add workarounds for VC15u7
| -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 7b49a90..dc6a636 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 <= 1913) || \ +#if !((defined(_MSC_VER) && _MSC_VER <= 1914) || \ (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 cc1ac04..7bbbe98 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 > 1913 +#if !defined(_MSC_VER) || _MSC_VER > 1914 , public locale::facet #endif { @@ -437,7 +437,7 @@ namespace std static locale::id id; -#if !defined(_MSC_VER) || _MSC_VER > 1913 +#if !defined(_MSC_VER) || _MSC_VER > 1914 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 <= 1913 +#if defined(_MSC_VER) && _MSC_VER <= 1914 static const ctype_base::mask _Ch_upper = ctype_base::upper; static const ctype_base::mask _Ch_alpha = ctype_base::alpha; |