Allow overriding THROW/CATCH/TRY macros with no-exceptions #938

nlohmann · Jan 28, 2018 · 763ac32 · 763ac32
1 parent cb4a9c8
commit 763ac32
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/develop/detail/macro_scope.hpp b/develop/detail/macro_scope.hpp
@@ -41,9 +41,15 @@
     #define JSON_TRY try
     #define JSON_CATCH(exception) catch(exception)
 #else
+    #if !defined(JSON_THROW)
     #define JSON_THROW(exception) std::abort()
+    #endif
+    #if !defined(JSON_TRY)
     #define JSON_TRY if(true)
+    #endif
+    #if !defined(JSON_CATCH)
     #define JSON_CATCH(exception) if(false)
+    #endif
 #endif
 
 // manual branch prediction

diff --git a/src/json.hpp b/src/json.hpp
@@ -151,9 +151,15 @@ using json = basic_json<>;
     #define JSON_TRY try
     #define JSON_CATCH(exception) catch(exception)
 #else
+    #if !defined(JSON_THROW)
     #define JSON_THROW(exception) std::abort()
+    #endif
+    #if !defined(JSON_TRY)
     #define JSON_TRY if(true)
+    #endif
+    #if !defined(JSON_CATCH)
     #define JSON_CATCH(exception) if(false)
+    #endif
 #endif
 
 // manual branch prediction