mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-27 07:23:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

jsoncpp: use own assert() macro which does not abort

Browse Source
This commit is contained in:
Stefan Seyfried
2016-01-10 19:35:09 +01:00
committed by svenhoefer
parent b307b78bf8
commit 73b5303cfc
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/jsoncpp/include/json/json.h
View File

@@ -68,6 +68,11 @@ license you like.
// End of content of file: LICENSE // 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)

6
lib/jsoncpp/jsoncpp.cpp
View File

@@ -198,7 +198,7 @@ static inline void fixNumericLocale(char* begin, char* end) {
#endif // if !defined(JSON_IS_AMALGAMATION) #endif // if !defined(JSON_IS_AMALGAMATION)
#include <utility> #include <utility>
#include <cstdio> #include <cstdio>
#include <cassert> //#include <cassert>
#include <cstring> #include <cstring>
#include <istream> #include <istream>
#include <sstream> #include <sstream>
@@ -2223,7 +2223,7 @@ ValueIterator& ValueIterator::operator=(const SelfType& other) {
#include <sstream> #include <sstream>
#include <utility> #include <utility>
#include <cstring> #include <cstring>
#include <cassert> //#include <cassert>
#ifdef JSON_USE_CPPTL #ifdef JSON_USE_CPPTL
#include <cpptl/conststring.h> #include <cpptl/conststring.h>
#endif #endif
@@ -3769,7 +3769,7 @@ Value& Path::make(Value& root) const {
#include <sstream> #include <sstream>
#include <utility> #include <utility>
#include <set> #include <set>
#include <cassert> //#include <cassert>
#include <cstring> #include <cstring>
#include <cstdio> #include <cstdio>