From 1ca5fe05c20c9c11d4c77cdbc0f120ff18373371 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Fri, 21 Jul 2017 18:37:26 +0200 Subject: Extend VC workarounds to version 19.11 --- libbutl/regex.cxx | 4 ++-- tests/base64/driver.cxx | 2 +- tests/timestamp/driver.cxx | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libbutl/regex.cxx b/libbutl/regex.cxx index 4e2e26f..a177a74 100644 --- a/libbutl/regex.cxx +++ b/libbutl/regex.cxx @@ -4,7 +4,7 @@ #include -#if defined(_MSC_VER) && _MSC_VER <= 1910 +#if defined(_MSC_VER) && _MSC_VER <= 1911 # include // strstr() #endif @@ -27,7 +27,7 @@ namespace std { const char* d (e.what ()); -#if defined(_MSC_VER) && _MSC_VER <= 1910 +#if defined(_MSC_VER) && _MSC_VER <= 1911 const char* rd (strstr (d, "): ")); if (rd != nullptr) d = rd + 3; diff --git a/tests/base64/driver.cxx b/tests/base64/driver.cxx index bbcdc11..040eaf8 100644 --- a/tests/base64/driver.cxx +++ b/tests/base64/driver.cxx @@ -26,7 +26,7 @@ encode (const string& i, const string& o) // VC15 seekg() doesn't clear eofbit. // -#if defined(_MSC_VER) && _MSC_VER <= 1910 +#if defined(_MSC_VER) && _MSC_VER <= 1911 is.clear (); #endif diff --git a/tests/timestamp/driver.cxx b/tests/timestamp/driver.cxx index d1e8d2c..661deb2 100644 --- a/tests/timestamp/driver.cxx +++ b/tests/timestamp/driver.cxx @@ -120,7 +120,7 @@ main () // "Apr 19:31:10 2016" for the format "%b %d %H:%M:%S %Y" as if the input were // "Apr 19 00:31:10 2016". // -#if !defined(_MSC_VER) || _MSC_VER > 1910 +#if !defined(_MSC_VER) || _MSC_VER > 1911 assert (fail ("Apr 19:31:10 2016", "%b %d %H:%M:%S %Y")); assert (fail (":31 2016", "%H:%M %Y")); #endif -- cgit v1.1