Make the json exception macro specifiable externally too

Thanks, windows
Vector35 · Sep 1, 2023 · 1882088 · 1882088
1 parent 3a2115b
commit 1882088
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/json/json.h b/json/json.h
@@ -469,6 +469,7 @@ class JSON_API Features {
 #if !defined(JSON_IS_AMALGAMATION)
 #include "forwards.h"
 #endif // if !defined(JSON_IS_AMALGAMATION)
+#include <stdexcept>
 #include <exception>
 #include <string>
 #include <vector>
@@ -502,11 +503,12 @@ class JSON_API Features {
 #pragma warning(disable : 4251)
 #endif // if defined(JSONCPP_DISABLE_DLL_INTERFACE_WARNING)
 
+#ifndef JSONCPP_EXCEPTION
 // XXX: BN: Use our exception class for extra details
 #include "../exceptions.h"
 #define JSONCPP_EXCEPTION ExceptionWithStackTrace
 // #define JSONCPP_EXCEPTION std::runtime_error
-
+#endif
 
 #pragma pack(push, 8)
 

diff --git a/json/jsoncpp.cpp b/json/jsoncpp.cpp
@@ -2654,7 +2654,7 @@ static inline void releaseStringValue(char* value, unsigned) { free(value); }
 namespace Json {
 
 // BN: subclass
-Exception::Exception(JSONCPP_STRING const& msg) : JSONCPP_EXCEPTION(msg) {}
+Exception::Exception(JSONCPP_STRING const& msg) : JSONCPP_EXCEPTION(msg.c_str()) {}
 Exception::~Exception() JSONCPP_NOEXCEPT {}
 // BN: removed what()
 RuntimeError::RuntimeError(JSONCPP_STRING const& msg) : Exception(msg) {}