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

Merge pull request #1214 from devsisters/fix-1213

Browse Source 
Fix #1213
This commit is contained in:
Niels Lohmann authored and GitHub committed 2018-08-24 17:54:28 +02:00
2 parents 359f98d140 aada309f61
commit 04597c3a66
2 files changed
+2
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

include/nlohmann/detail/macro_scope.hpp
+1
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)
single_include/nlohmann/json.hpp
+1
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)