amorfo77/json
1
0
Fork 0
mirror of https://github.com/nlohmann/json.git synced 2026-08-05 08:52:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add new JSON_INTERNAL_CATCH macro function

Browse Source
This commit is contained in:
Hyeon Kim
2018-07-19 15:43:41 +09:00
parent 7bfc406ded
commit d0e60de433
4 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/nlohmann/detail/macro_scope.hpp
+7
View File
@@ -42,10 +42,12 @@
#define JSON_THROW(exception) throw exception
#define JSON_TRY try
#define JSON_CATCH(exception) catch(exception)
#define JSON_INTERNAL_CATCH(exception) catch(exception)
#else
#define JSON_THROW(exception) std::abort()
#define JSON_TRY if(true)
#define JSON_CATCH(exception) if(false)
#define JSON_INTERNAL_CATCH(exception) if(false)
#endif
// override exception macros
@@ -60,6 +62,11 @@
#if defined(JSON_CATCH_USER)
#undef JSON_CATCH
#define JSON_CATCH JSON_CATCH_USER
#define JSON_INTERNAL_CATCH JSON_CATCH_USER
#endif
#if defined(JSON_INTERNAL_CATCH_USER)
#undef JSON_INTERNAL_CATCH
#define JSON_INTERNAL_CATCH JSON_INTERNAL_CATCH_USER
#endif
// manual branch prediction
include/nlohmann/detail/macro_unscope.hpp
+1
View File
@@ -9,6 +9,7 @@
#endif
// clean up
#undef JSON_INTERNAL_CATCH
#undef JSON_CATCH
#undef JSON_THROW
#undef JSON_TRY