mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-27 15:32:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

re-apply 717ed7e87c

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 43bf709669
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2016-01-16 (Sat, 16 Jan 2016)

Origin message was:
------------------
- re-apply 717ed7e87c

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
gixxpunk
2016-01-16 12:05:33 +01:00
committed by vanhofen
parent 2c3370e9f3
commit 33e0848e69
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -68,7 +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>
@@ -2195,7 +2195,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
@@ -3725,7 +3725,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>