Update doctest to 2.4.7

USCiLab · Jan 10, 2022 · a64b811 · a64b811
1 parent 8291f44
commit a64b811
Show file tree

Hide file tree

Showing 4 changed files with 250 additions and 104 deletions.
diff --git a/.github/workflows/ci-macos.yml b/.github/workflows/ci-macos.yml
@@ -1,4 +1,4 @@
-name: Test cereal
+name: cereal mac ci
 on: [push, pull_request]
 
 jobs:

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -1,4 +1,4 @@
-name: Test cereal
+name: cereal linux ci
 on: [push, pull_request]
 
 jobs:

diff --git a/unittests/common.hpp b/unittests/common.hpp
@@ -56,6 +56,16 @@
 #include <limits>
 #include <random>
 
+// gcc 4.7 thread_local workaround for doctest
+#if defined(__GNUC__) && __GNUC__ == 4 && __GNUC_MINOR__ < 8
+#define DOCTEST_THREAD_LOCAL
+#endif // gcc 4.7
+
+// MSVC 2013 workaround for doctest
+#if defined(_MSC_VER) && _MSC_VER < 1900
+__pragma(warning(disable : 4715))
+#endif // _MSC_VER
+
 #include "doctest.h"
 
 namespace std