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

Merge pull request #1214 from devsisters/fix-1213

Browse source 
Fix #1213
This commit is contained in:
Niels Lohmann 2018-08-24 17:54:28 +02:00 committed by GitHub
commit 04597c3a66
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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)