diff options
| author | Karen Arutyunov <karen@codesynthesis.com> | 2019-03-13 00:35:17 +0300 |
|---|---|---|
| committer | Karen Arutyunov <karen@codesynthesis.com> | 2019-03-13 14:03:02 +0300 |
| commit | e5d55e3245e148d675d4be607f1bfa944c4559e7 (patch) | |
| tree | 9a7aecf407b9718e2ecaaf3a0688ccc76b1977fe | |
| parent | abf8895cc8611c23bda243e027360d7f91d47cc5 (diff) | |
Add workarounds for all cl releases until 20.00
| -rw-r--r-- | build2/function.hxx | 4 | ||||
| -rw-r--r-- | build2/test/script/regex.hxx | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/build2/function.hxx b/build2/function.hxx index 0c021e3..e9e0939 100644 --- a/build2/function.hxx +++ b/build2/function.hxx @@ -135,10 +135,10 @@ namespace build2 D d) : function_overload (an, mi, ma, move (ts), im) { - // std::is_pod appears to be broken in VC15 and also in GCC up to + // std::is_pod appears to be broken in VC16 and also in GCC up to // 5 (pointers to members). // -#if !((defined(_MSC_VER) && _MSC_VER < 1920) || \ +#if !((defined(_MSC_VER) && _MSC_VER < 2000) || \ (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 10f2d94..b29eee2 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 >= 1920 +#if !defined(_MSC_VER) || _MSC_VER >= 2000 , public locale::facet #endif { @@ -437,7 +437,7 @@ namespace std static locale::id id; -#if !defined(_MSC_VER) || _MSC_VER >= 1920 +#if !defined(_MSC_VER) || _MSC_VER >= 2000 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 < 1920 +#if defined(_MSC_VER) && _MSC_VER < 2000 static const ctype_base::mask _Ch_upper = ctype_base::upper; static const ctype_base::mask _Ch_alpha = ctype_base::alpha; |