Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- diff --git a/lib/jsoncpp/json/json-forwards.h b/lib/jsoncpp/json/json-forwards.h
- index b9d46e6..60d3bd0 100644
- --- a/lib/jsoncpp/json/json-forwards.h
- +++ b/lib/jsoncpp/json/json-forwards.h
- @@ -11,7 +11,7 @@ The JsonCpp library's source code, including accompanying documentation,
- tests and demonstration applications, are licensed under the following
- conditions...
- -Baptiste Lepilleur and The JsonCpp Authors explicitly disclaim copyright in all
- +Baptiste Lepilleur and The JsonCpp Authors explicitly disclaim copyright in all
- jurisdictions which recognize such a disclaimer. In such jurisdictions,
- this software is released into the Public Domain.
- @@ -94,12 +94,6 @@ license you like.
- #include <string> //typedef String
- #include <stdint.h> //typedef int64_t, uint64_t
- -/* 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)
- -
- /// If defined, indicates that json library is embedded in CppTL library.
- //# define JSON_IN_CPPTL 1
- diff --git a/lib/jsoncpp/json/json.h b/lib/jsoncpp/json/json.h
- index 0ad699d..8dd8085 100644
- --- a/lib/jsoncpp/json/json.h
- +++ b/lib/jsoncpp/json/json.h
- @@ -10,7 +10,7 @@ The JsonCpp library's source code, including accompanying documentation,
- tests and demonstration applications, are licensed under the following
- conditions...
- -Baptiste Lepilleur and The JsonCpp Authors explicitly disclaim copyright in all
- +Baptiste Lepilleur and The JsonCpp Authors explicitly disclaim copyright in all
- jurisdictions which recognize such a disclaimer. In such jurisdictions,
- this software is released into the Public Domain.
- @@ -127,12 +127,6 @@ license you like.
- #include <string> //typedef String
- #include <stdint.h> //typedef int64_t, uint64_t
- -/* 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)
- -
- /// If defined, indicates that json library is embedded in CppTL library.
- //# define JSON_IN_CPPTL 1
- diff --git a/lib/jsoncpp/jsoncpp.cpp b/lib/jsoncpp/jsoncpp.cpp
- index ce72ec1..d423969 100644
- --- a/lib/jsoncpp/jsoncpp.cpp
- +++ b/lib/jsoncpp/jsoncpp.cpp
- @@ -10,7 +10,7 @@ The JsonCpp library's source code, including accompanying documentation,
- tests and demonstration applications, are licensed under the following
- conditions...
- -Baptiste Lepilleur and The JsonCpp Authors explicitly disclaim copyright in all
- +Baptiste Lepilleur and The JsonCpp Authors explicitly disclaim copyright in all
- jurisdictions which recognize such a disclaimer. In such jurisdictions,
- this software is released into the Public Domain.
- @@ -229,7 +229,7 @@ static inline void fixNumericLocaleInput(char* begin, char* end) {
- #endif // if !defined(JSON_IS_AMALGAMATION)
- #include <utility>
- #include <cstdio>
- -//#include <cassert>
- +#include <cassert>
- #include <cstring>
- #include <istream>
- #include <sstream>
- @@ -2484,7 +2484,7 @@ ValueIterator& ValueIterator::operator=(const SelfType& other) {
- #include <sstream>
- #include <utility>
- #include <cstring>
- -//#include <cassert>
- +#include <cassert>
- #ifdef JSON_USE_CPPTL
- #include <cpptl/conststring.h>
- #endif
- @@ -3659,9 +3659,6 @@ bool Value::removeMember(JSONCPP_STRING const& key, Value* removed)
- {
- return removeMember(key.data(), key.data() + key.length(), removed);
- }
- -
- -#pragma GCC diagnostic push
- -#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
- Value Value::removeMember(const char* key)
- {
- JSON_ASSERT_MESSAGE(type_ == nullValue || type_ == objectValue,
- @@ -3677,7 +3674,6 @@ Value Value::removeMember(const JSONCPP_STRING& key)
- {
- return removeMember(key.c_str());
- }
- -#pragma GCC diagnostic pop
- bool Value::removeIndex(ArrayIndex index, Value* removed) {
- if (type_ != arrayValue) {
- @@ -4164,7 +4160,7 @@ Value& Path::make(Value& root) const {
- #include <sstream>
- #include <utility>
- #include <set>
- -//#include <cassert>
- +#include <cassert>
- #include <cstring>
- #include <cstdio>
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement