j3d1/json
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'feature/no_exceptions' into develop

Browse source
This commit is contained in:
Niels Lohmann 2017-03-12 11:49:52 +01:00
commit dfa4e83cd8
No known key found for this signature in database
GPG key ID: 7F3CEA63AE251B69
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/json.hpp
View file

@ -82,7 +82,7 @@ SOFTWARE.
#endif #endif
// allow to disable exceptions // 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_THROW(exception) throw exception
#define JSON_TRY try #define JSON_TRY try
#define JSON_CATCH(exception) catch(exception) #define JSON_CATCH(exception) catch(exception)

2
src/json.hpp.re2c
View file

@ -82,7 +82,7 @@ SOFTWARE.
#endif #endif
// allow to disable exceptions // 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_THROW(exception) throw exception
#define JSON_TRY try #define JSON_TRY try
#define JSON_CATCH(exception) catch(exception) #define JSON_CATCH(exception) catch(exception)