From ecc689a03781287af84c1ec9de5643237f8045ad Mon Sep 17 00:00:00 2001
From: Yonghui <huangyh56@gmail.com>
Date: Thu, 6 Oct 2016 21:30:50 +0200
Subject: [PATCH] fix some settings for running testrunner in vs2015/windows
---
Tests/GeoLib/TestLineSegmentIntersect2d.cpp | 2 +-
Tests/GeoLib/TestSortSegments.cpp | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Tests/GeoLib/TestLineSegmentIntersect2d.cpp b/Tests/GeoLib/TestLineSegmentIntersect2d.cpp
index 819ffc4fa09..62d7a5d3c0c 100644
--- a/Tests/GeoLib/TestLineSegmentIntersect2d.cpp
+++ b/Tests/GeoLib/TestLineSegmentIntersect2d.cpp
@@ -50,7 +50,7 @@ public:
ac::gtest_reporter gtest_reporter;
};
-#if !defined(_MSC_VER) || (_MSC_VER >= 1900)
+#if !defined(_MSC_VER) || (_MSC_VER >= 2000)
// Compilers of MVS below 2015 do not support unrestricted unions. The
// unrestricted union is used by autocheck to handle test data. The autocheck
// workaround for MVS compilers (below version 2015) contains a bug and in the
diff --git a/Tests/GeoLib/TestSortSegments.cpp b/Tests/GeoLib/TestSortSegments.cpp
index 247dab95dfc..1b2c6c76ef8 100644
--- a/Tests/GeoLib/TestSortSegments.cpp
+++ b/Tests/GeoLib/TestSortSegments.cpp
@@ -8,7 +8,7 @@
*/
#include <gtest/gtest.h>
-
+#include <numeric>
#include "Tests/GeoLib/AutoCheckGenerators.h"
#include "GeoLib/AnalyticalGeometry.h"
@@ -30,7 +30,7 @@ public:
ac::gtest_reporter gtest_reporter;
};
-#if !defined(_MSC_VER) || (_MSC_VER >= 1900)
+#if !defined(_MSC_VER) || (_MSC_VER >= 2000)
// Compilers of MVS below 2015 do not support unrestricted unions. The
// unrestricted union is used by autocheck to handle test data. The autocheck
// workaround for MVS compilers (below version 2015) contains a bug and in the
--
GitLab