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

Add JSON_USE_RUNTIME_ERROR_STORAGE

Browse Source
This commit is contained in:
Jamie Seward 2017-10-23 23:22:52 -07:00
parent 720d86d4f1
commit f6c1ab695c
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/json.hpp
View File

@ -94,6 +94,7 @@ SOFTWARE.
#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,10 +204,17 @@ class exception : public std::exception
{ {
public: public:
/// returns the explanatory string /// returns the explanatory string
#if defined(JSON_USE_RUNTIME_ERROR_STORAGE)
const char* what() const noexcept override const char* what() const noexcept override
{ {
return m.what(); return m.what();
} }
#else
const char* what() const noexcept override
{
return m.c_str();
}
#endif
/// the id of the exception /// the id of the exception
const int id; const int id;
@ -221,7 +229,11 @@ class exception : public std::exception
private: private:
/// 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
std::string m;
#endif
}; };
/*! /*!
@ -14800,6 +14812,7 @@ inline nlohmann::json::json_pointer operator "" _json_pointer(const char* s, std
#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