j3d1/json
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

overlapping defines

Browse source
This commit is contained in:
Niels 2016-06-29 09:16:18 +02:00
parent dc479b3f9d
commit d456dec320
2 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/json.hpp
View file

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

3
src/json.hpp.re2c
View file

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