Fix #1213

aada309f · Hyeon Kim · 359f98d1 · aada309f · aada309f
Unverified Commit aada309f authored Aug 24, 2018 by Hyeon Kim
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

include/nlohmann/detail/macro_scope.hpp include/nlohmann/detail/macro_scope.hpp +1 -0

single_include/nlohmann/json.hpp single_include/nlohmann/json.hpp +1 -0

No files found.
--- a/include/nlohmann/detail/macro_scope.hpp
+++ b/include/nlohmann/detail/macro_scope.hpp
@@ -62,6 +62,7 @@
 #if defined(JSON_CATCH_USER)
    #undef JSON_CATCH
    #define JSON_CATCH JSON_CATCH_USER
+    #undef JSON_INTERNAL_CATCH
    #define JSON_INTERNAL_CATCH JSON_CATCH_USER
 #endif
 #if defined(JSON_INTERNAL_CATCH_USER)

--- a/single_include/nlohmann/json.hpp
+++ b/single_include/nlohmann/json.hpp
@@ -177,6 +177,7 @@ using json = basic_json<>;
 #if defined(JSON_CATCH_USER)
    #undef JSON_CATCH
    #define JSON_CATCH JSON_CATCH_USER
+    #undef JSON_INTERNAL_CATCH
    #define JSON_INTERNAL_CATCH JSON_CATCH_USER
 #endif
 #if defined(JSON_INTERNAL_CATCH_USER)