From 0d39a6fb95e86517463617c5721b8609c530f5fd Mon Sep 17 00:00:00 2001
From: Chuck Atkins <chuck.atkins@kitware.com>
Date: Mon, 8 May 2017 09:34:16 -0400
Subject: [PATCH] Json: Drop gcc requirement to 4.8
This doesn't work across the board for json.hpp but it works for the
the way we use it.
---
thirdparty/NLohmannJson/json/empty | 0
thirdparty/NLohmannJson/json/src/json.hpp | 2 +-
2 files changed, 1 insertion(+), 1 deletion(-)
delete mode 100644 thirdparty/NLohmannJson/json/empty
diff --git a/thirdparty/NLohmannJson/json/empty b/thirdparty/NLohmannJson/json/empty
deleted file mode 100644
index e69de29bb..000000000
diff --git a/thirdparty/NLohmannJson/json/src/json.hpp b/thirdparty/NLohmannJson/json/src/json.hpp
index 6dfc1831f..ee04c77c7 100644
--- a/thirdparty/NLohmannJson/json/src/json.hpp
+++ b/thirdparty/NLohmannJson/json/src/json.hpp
@@ -63,7 +63,7 @@ SOFTWARE.
#error "unsupported Clang version - see https://github.com/nlohmann/json#supported-compilers"
#endif
#elif defined(__GNUC__)
- #if (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) < 40900
+ #if (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) < 40800
#error "unsupported GCC version - see https://github.com/nlohmann/json#supported-compilers"
#endif
#endif
--
GitLab