External/json
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add JSON_EXCEPTIONS_ENABLED

Browse Source
This commit is contained in:
Jamie Seward 2017-10-24 01:24:03 -07:00
parent f6c1ab695c
commit 5fc084d808
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/json.hpp
View File

@ -91,10 +91,10 @@ SOFTWARE.
// allow to disable exceptions // allow to disable exceptions
#if (defined(__cpp_exceptions) || defined(__EXCEPTIONS) || defined(_CPPUNWIND)) && not defined(JSON_NOEXCEPTION) #if (defined(__cpp_exceptions) || defined(__EXCEPTIONS) || defined(_CPPUNWIND)) && not defined(JSON_NOEXCEPTION)
#define JSON_EXCEPTIONS_ENABLED
#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)
#define JSON_USE_RUNTIME_ERROR_STORAGE
#else #else
#define JSON_THROW(exception) std::abort() #define JSON_THROW(exception) std::abort()
#define JSON_TRY if(true) #define JSON_TRY if(true)
@ -203,8 +203,8 @@ caught.,exception}
class exception : public std::exception class exception : public std::exception
{ {
public: public:
/// returns the explanatory string /// returns the explanatory string.
#if defined(JSON_USE_RUNTIME_ERROR_STORAGE) #if defined(JSON_EXCEPTIONS_ENABLED)
const char* what() const noexcept override const char* what() const noexcept override
{ {
return m.what(); return m.what();
@ -228,10 +228,14 @@ class exception : public std::exception
} }
private: private:
#if defined(JSON_EXCEPTIONS_ENABLED)
/// an exception object as storage for error messages /// an exception object as storage for error messages
#if defined(JSON_USE_RUNTIME_ERROR_STORAGE)
std::runtime_error m; std::runtime_error m;
#else #else
/// if exceptions are disabled then std::runtime_error is not
/// guaranteed to contain storage for the string. Use std::string
/// instead because we aren't actually throwing this object. Just
/// passing it back as an out param.
std::string m; std::string m;
#endif #endif
}; };
@ -14809,10 +14813,10 @@ inline nlohmann::json::json_pointer operator "" _json_pointer(const char* s, std
#endif #endif
// clean up // clean up
#undef JSON_EXCEPTIONS_DISABLED
#undef JSON_CATCH #undef JSON_CATCH
#undef JSON_THROW #undef JSON_THROW
#undef JSON_TRY #undef JSON_TRY
#undef JSON_USE_RUNTIME_ERROR_STORAGE
#undef JSON_LIKELY #undef JSON_LIKELY
#undef JSON_UNLIKELY #undef JSON_UNLIKELY
#undef JSON_DEPRECATED #undef JSON_DEPRECATED