From 4966048440b4d3c2c587004a0cca3fcd23abc3d5 Mon Sep 17 00:00:00 2001 From: Per-Arne Andersen Date: Sat, 25 Mar 2017 10:42:52 +0100 Subject: [PATCH 1/2] Nudge GCC Version requirement to 4.8.5 --- README.md | 2 +- src/json.hpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 3d9123052..866ff58ec 100644 --- a/README.md +++ b/README.md @@ -703,7 +703,7 @@ json j_from_msgpack = json::from_msgpack(v_msgpack); Though it's 2016 already, the support for C++11 is still a bit sparse. Currently, the following compilers are known to work: -- GCC 4.9 - 6.0 (and possibly later) +- GCC 4.8.5 - 6.0 (and possibly later) - Clang 3.4 - 3.9 (and possibly later) - Microsoft Visual C++ 2015 / Build Tools 14.0.25123.0 (and possibly later) diff --git a/src/json.hpp b/src/json.hpp index 6ec045aaa..3b1634cff 100644 --- a/src/json.hpp +++ b/src/json.hpp @@ -61,7 +61,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__) < 40805 #error "unsupported GCC version - see https://github.com/nlohmann/json#supported-compilers" #endif #endif From 89ffcac64225da4055d19cb80e92bdb0b325b0a9 Mon Sep 17 00:00:00 2001 From: Per-Arne Andersen Date: Sat, 25 Mar 2017 10:45:36 +0100 Subject: [PATCH 2/2] Update re2c --- src/json.hpp.re2c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/json.hpp.re2c b/src/json.hpp.re2c index 7d21f76bb..d2722c03a 100644 --- a/src/json.hpp.re2c +++ b/src/json.hpp.re2c @@ -61,7 +61,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__) < 40805 #error "unsupported GCC version - see https://github.com/nlohmann/json#supported-compilers" #endif #endif