diff --git a/lib/jsoncpp/include/json/json.h b/lib/jsoncpp/include/json/json.h index f27ecfc81..be8136015 100644 --- a/lib/jsoncpp/include/json/json.h +++ b/lib/jsoncpp/include/json/json.h @@ -68,6 +68,11 @@ license you like. // End of content of file: LICENSE // ////////////////////////////////////////////////////////////////////// +/* own assert() which does not abort... */ +#define assert(x) do { \ + if (x) \ + fprintf(stderr, "JSONCPP:%s:%d assert(%s) failed\n", __func__, __LINE__, #x); \ +} while (0) diff --git a/lib/jsoncpp/jsoncpp.cpp b/lib/jsoncpp/jsoncpp.cpp index 7a2c7f0c7..c9e1071c1 100644 --- a/lib/jsoncpp/jsoncpp.cpp +++ b/lib/jsoncpp/jsoncpp.cpp @@ -198,7 +198,7 @@ static inline void fixNumericLocale(char* begin, char* end) { #endif // if !defined(JSON_IS_AMALGAMATION) #include #include -#include +//#include #include #include #include @@ -2223,7 +2223,7 @@ ValueIterator& ValueIterator::operator=(const SelfType& other) { #include #include #include -#include +//#include #ifdef JSON_USE_CPPTL #include #endif @@ -3769,7 +3769,7 @@ Value& Path::make(Value& root) const { #include #include #include -#include +//#include #include #include