diff --git a/thirdparty/NLohmannJson/json/empty b/thirdparty/NLohmannJson/json/empty deleted file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000 diff --git a/thirdparty/NLohmannJson/json/src/json.hpp b/thirdparty/NLohmannJson/json/src/json.hpp index 6dfc1831fa8cdb54724f6dd7ff280da4e8a8daea..ee04c77c76650155d066805828c8b4112ecea7fe 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