amorfo77/json
1
0 Fork 0
mirror of https://github.com/nlohmann/json.git synced 2026-10-12 01:17:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

overlapping defines

Browse Source
This commit is contained in:
Niels committed 2016-06-29 09:16:18 +02:00
1 parent dc479b3f9d
commit d456dec320
2 files changed
+2 -4
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/json.hpp
+1 -2
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"
src/json.hpp.re2c
+1 -2
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"