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

Fix #1213

Browse source
This commit is contained in:
Hyeon Kim 2018-08-24 21:52:24 +09:00
parent 359f98d140
commit aada309f61
No known key found for this signature in database
GPG key ID: 0F85F46EE242057F
2 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/nlohmann/detail/macro_scope.hpp
View file

@ -62,6 +62,7 @@
#if defined(JSON_CATCH_USER) #if defined(JSON_CATCH_USER)
#undef JSON_CATCH #undef JSON_CATCH
#define JSON_CATCH JSON_CATCH_USER #define JSON_CATCH JSON_CATCH_USER
#undef JSON_INTERNAL_CATCH
#define JSON_INTERNAL_CATCH JSON_CATCH_USER #define JSON_INTERNAL_CATCH JSON_CATCH_USER
#endif #endif
#if defined(JSON_INTERNAL_CATCH_USER) #if defined(JSON_INTERNAL_CATCH_USER)

1
single_include/nlohmann/json.hpp
View file

@ -177,6 +177,7 @@ using json = basic_json<>;
#if defined(JSON_CATCH_USER) #if defined(JSON_CATCH_USER)
#undef JSON_CATCH #undef JSON_CATCH
#define JSON_CATCH JSON_CATCH_USER #define JSON_CATCH JSON_CATCH_USER
#undef JSON_INTERNAL_CATCH
#define JSON_INTERNAL_CATCH JSON_CATCH_USER #define JSON_INTERNAL_CATCH JSON_CATCH_USER
#endif #endif
#if defined(JSON_INTERNAL_CATCH_USER) #if defined(JSON_INTERNAL_CATCH_USER)