Merge branch 'feature/no_exceptions' into develop
This commit is contained in:
commit
dfa4e83cd8
2 changed files with 2 additions and 2 deletions
|
@ -82,7 +82,7 @@ SOFTWARE.
|
|||
#endif
|
||||
|
||||
// allow to disable exceptions
|
||||
#if not defined(JSON_NOEXCEPTION) || defined(__EXCEPTIONS)
|
||||
#if (defined(__cpp_exceptions) || defined(__EXCEPTIONS) || defined(_CPPUNWIND)) && not defined(JSON_NOEXCEPTION)
|
||||
#define JSON_THROW(exception) throw exception
|
||||
#define JSON_TRY try
|
||||
#define JSON_CATCH(exception) catch(exception)
|
||||
|
|
|
@ -82,7 +82,7 @@ SOFTWARE.
|
|||
#endif
|
||||
|
||||
// allow to disable exceptions
|
||||
#if not defined(JSON_NOEXCEPTION) || defined(__EXCEPTIONS)
|
||||
#if (defined(__cpp_exceptions) || defined(__EXCEPTIONS) || defined(_CPPUNWIND)) && not defined(JSON_NOEXCEPTION)
|
||||
#define JSON_THROW(exception) throw exception
|
||||
#define JSON_TRY try
|
||||
#define JSON_CATCH(exception) catch(exception)
|
||||
|
|
Loading…
Reference in a new issue