From 13dba208df7b64cd5086bfc7dd4bebc264decba3 Mon Sep 17 00:00:00 2001 From: Chuck Atkins <chuck.atkins@kitware.com> Date: Wed, 26 Apr 2017 15:01:11 -0400 Subject: [PATCH] Allow json.hpp to be used with gcc 4.8.5 There are a few issues with this that prevent it from being accepted upstream but it's fine for how we use it. --- source/dataman/json.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/dataman/json.hpp b/source/dataman/json.hpp index 86a62c0b0..c695ce215 100644 --- a/source/dataman/json.hpp +++ b/source/dataman/json.hpp @@ -63,7 +63,7 @@ SOFTWARE. "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__) < 40805 #error \ "unsupported GCC version - see https://github.com/nlohmann/json#supported-compilers" #endif -- GitLab