From 53e82a43a563992986c50089f6af765fa5cff526 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Fri, 13 Apr 2018 14:54:50 +0200 Subject: Add workarounds for VC15u7 --- 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 6f7fad6..a48102a 100644 --- a/libbutl/regex.cxx +++ b/libbutl/regex.cxx @@ -15,7 +15,7 @@ #include #include #include // runtime_error -#if defined(_MSC_VER) && _MSC_VER <= 1913 +#if defined(_MSC_VER) && _MSC_VER <= 1914 # include // strstr() #endif #endif @@ -52,7 +52,7 @@ namespace std { const char* d (e.what ()); -#if defined(_MSC_VER) && _MSC_VER <= 1913 +#if defined(_MSC_VER) && _MSC_VER <= 1914 // Note: run the regex test like this to check new VC version: // // ./driver.exe a '{' b diff --git a/tests/base64/driver.cxx b/tests/base64/driver.cxx index 1aa5b42..a9a6313 100644 --- a/tests/base64/driver.cxx +++ b/tests/base64/driver.cxx @@ -40,7 +40,7 @@ encode (const string& i, const string& o) // VC15 seekg() doesn't clear eofbit. // -#if defined(_MSC_VER) && _MSC_VER <= 1913 +#if defined(_MSC_VER) && _MSC_VER <= 1914 is.clear (); #endif diff --git a/tests/timestamp/driver.cxx b/tests/timestamp/driver.cxx index e447e18..ce5d204 100644 --- a/tests/timestamp/driver.cxx +++ b/tests/timestamp/driver.cxx @@ -133,7 +133,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 > 1913 +#if !defined(_MSC_VER) || _MSC_VER > 1914 assert (fail ("Apr 19:31:10 2016", "%b %d %H:%M:%S %Y")); assert (fail (":31 2016", "%H:%M %Y")); #endif -- cgit v1.1