mirror of
https://github.com/nlohmann/json.git
synced 2024-08-23 13:32:28 +02:00
overlapping defines
This commit is contained in:
parent
dc479b3f9d
commit
d456dec320
|
@ -59,8 +59,7 @@ SOFTWARE.
|
||||||
#if CLANG_VERSION < 34000
|
#if CLANG_VERSION < 34000
|
||||||
#error "unsupported Clang version - see https://github.com/nlohmann/json#supported-compilers"
|
#error "unsupported Clang version - see https://github.com/nlohmann/json#supported-compilers"
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#elif defined(__GNUC__)
|
||||||
#if defined(__GNUC__)
|
|
||||||
#define GCC_VERSION (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__)
|
#define GCC_VERSION (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__)
|
||||||
#if GCC_VERSION < 48000
|
#if GCC_VERSION < 48000
|
||||||
#error "unsupported GCC version - see https://github.com/nlohmann/json#supported-compilers"
|
#error "unsupported GCC version - see https://github.com/nlohmann/json#supported-compilers"
|
||||||
|
|
|
@ -59,8 +59,7 @@ SOFTWARE.
|
||||||
#if CLANG_VERSION < 34000
|
#if CLANG_VERSION < 34000
|
||||||
#error "unsupported Clang version - see https://github.com/nlohmann/json#supported-compilers"
|
#error "unsupported Clang version - see https://github.com/nlohmann/json#supported-compilers"
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#elif defined(__GNUC__)
|
||||||
#if defined(__GNUC__)
|
|
||||||
#define GCC_VERSION (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__)
|
#define GCC_VERSION (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__)
|
||||||
#if GCC_VERSION < 48000
|
#if GCC_VERSION < 48000
|
||||||
#error "unsupported GCC version - see https://github.com/nlohmann/json#supported-compilers"
|
#error "unsupported GCC version - see https://github.com/nlohmann/json#supported-compilers"
|
||||||
|
|
Loading…
Reference in a new issue