overlapping defines

d456dec3 · Niels · dc479b3f · d456dec3 · d456dec3
Commit d456dec3 authored Jun 29, 2016 by Niels
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 4 deletions

src/json.hpp src/json.hpp +1 -2

src/json.hpp.re2c src/json.hpp.re2c +1 -2

No files found.
--- 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"

--- 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"