From d456dec320b198c1376cd10cb1697038f341de08 Mon Sep 17 00:00:00 2001 From: Niels Date: Wed, 29 Jun 2016 09:16:18 +0200 Subject: [PATCH] overlapping defines --- src/json.hpp | 3 +-- src/json.hpp.re2c | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/json.hpp b/src/json.hpp index 1673fb17a..eaa3a44e1 100644 --- a/src/json.hpp +++ b/src/json.hpp @@ -59,8 +59,7 @@ SOFTWARE. #if CLANG_VERSION < 34000 #error "unsupported Clang version - see https://github.com/nlohmann/json#supported-compilers" #endif -#endif -#if defined(__GNUC__) +#elif defined(__GNUC__) #define GCC_VERSION (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) #if GCC_VERSION < 48000 #error "unsupported GCC version - see https://github.com/nlohmann/json#supported-compilers" diff --git a/src/json.hpp.re2c b/src/json.hpp.re2c index 2672c1d0a..9c94a2ba0 100644 --- a/src/json.hpp.re2c +++ b/src/json.hpp.re2c @@ -59,8 +59,7 @@ SOFTWARE. #if CLANG_VERSION < 34000 #error "unsupported Clang version - see https://github.com/nlohmann/json#supported-compilers" #endif -#endif -#if defined(__GNUC__) +#elif defined(__GNUC__) #define GCC_VERSION (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) #if GCC_VERSION < 48000 #error "unsupported GCC version - see https://github.com/nlohmann/json#supported-compilers"