mirror of
https://github.com/nlohmann/json.git
synced 2025-01-23 19:11:30 +08:00
🏁 added check for _CPPUNWIND
MSVC does not define __cpp_exceptions, but seems to use _CPPUNWIND when exception support is switched on, see https://msdn.microsoft.com/en-us/library/b0084kay.aspx.
This commit is contained in:
parent
65dfc97d40
commit
e3e6cbecc7
@ -82,7 +82,7 @@ SOFTWARE.
|
||||
#endif
|
||||
|
||||
// allow to disable exceptions
|
||||
#if __cpp_exceptions && not defined(JSON_NOEXCEPTION)
|
||||
#if (__cpp_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 __cpp_exceptions && not defined(JSON_NOEXCEPTION)
|
||||
#if (__cpp_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 New Issue
Block a user