Advertisement
svenhoefer

Untitled

Sep 21st, 2017
205
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 4.11 KB | None | 0 0
  1. diff --git a/lib/jsoncpp/json/json-forwards.h b/lib/jsoncpp/json/json-forwards.h
  2. index b9d46e6..60d3bd0 100644
  3. --- a/lib/jsoncpp/json/json-forwards.h
  4. +++ b/lib/jsoncpp/json/json-forwards.h
  5. @@ -11,7 +11,7 @@ The JsonCpp library's source code, including accompanying documentation,
  6.  tests and demonstration applications, are licensed under the following
  7.  conditions...
  8.  
  9. -Baptiste Lepilleur and The JsonCpp Authors explicitly disclaim copyright in all
  10. +Baptiste Lepilleur and The JsonCpp Authors explicitly disclaim copyright in all
  11.  jurisdictions which recognize such a disclaimer. In such jurisdictions,
  12.  this software is released into the Public Domain.
  13.  
  14. @@ -94,12 +94,6 @@ license you like.
  15.  #include <string> //typedef String
  16.  #include <stdint.h> //typedef int64_t, uint64_t
  17.  
  18. -/* own assert() which does not abort... */
  19. -#define assert(x) do { \
  20. -       if (x) \
  21. -               fprintf(stderr, "JSONCPP:%s:%d assert(%s) failed\n", __func__, __LINE__, #x); \
  22. -} while (0)
  23. -
  24.  /// If defined, indicates that json library is embedded in CppTL library.
  25.  //# define JSON_IN_CPPTL 1
  26.  
  27. diff --git a/lib/jsoncpp/json/json.h b/lib/jsoncpp/json/json.h
  28. index 0ad699d..8dd8085 100644
  29. --- a/lib/jsoncpp/json/json.h
  30. +++ b/lib/jsoncpp/json/json.h
  31. @@ -10,7 +10,7 @@ The JsonCpp library's source code, including accompanying documentation,
  32.  tests and demonstration applications, are licensed under the following
  33.  conditions...
  34.  
  35. -Baptiste Lepilleur and The JsonCpp Authors explicitly disclaim copyright in all
  36. +Baptiste Lepilleur and The JsonCpp Authors explicitly disclaim copyright in all
  37.  jurisdictions which recognize such a disclaimer. In such jurisdictions,
  38.  this software is released into the Public Domain.
  39.  
  40. @@ -127,12 +127,6 @@ license you like.
  41.  #include <string> //typedef String
  42.  #include <stdint.h> //typedef int64_t, uint64_t
  43.  
  44. -/* own assert() which does not abort... */
  45. -#define assert(x) do { \
  46. -       if (x) \
  47. -               fprintf(stderr, "JSONCPP:%s:%d assert(%s) failed\n", __func__, __LINE__, #x); \
  48. -} while (0)
  49. -
  50.  /// If defined, indicates that json library is embedded in CppTL library.
  51.  //# define JSON_IN_CPPTL 1
  52.  
  53. diff --git a/lib/jsoncpp/jsoncpp.cpp b/lib/jsoncpp/jsoncpp.cpp
  54. index ce72ec1..d423969 100644
  55. --- a/lib/jsoncpp/jsoncpp.cpp
  56. +++ b/lib/jsoncpp/jsoncpp.cpp
  57. @@ -10,7 +10,7 @@ The JsonCpp library's source code, including accompanying documentation,
  58.  tests and demonstration applications, are licensed under the following
  59.  conditions...
  60.  
  61. -Baptiste Lepilleur and The JsonCpp Authors explicitly disclaim copyright in all
  62. +Baptiste Lepilleur and The JsonCpp Authors explicitly disclaim copyright in all
  63.  jurisdictions which recognize such a disclaimer. In such jurisdictions,
  64.  this software is released into the Public Domain.
  65.  
  66. @@ -229,7 +229,7 @@ static inline void fixNumericLocaleInput(char* begin, char* end) {
  67.  #endif // if !defined(JSON_IS_AMALGAMATION)
  68.  #include <utility>
  69.  #include <cstdio>
  70. -//#include <cassert>
  71. +#include <cassert>
  72.  #include <cstring>
  73.  #include <istream>
  74.  #include <sstream>
  75. @@ -2484,7 +2484,7 @@ ValueIterator& ValueIterator::operator=(const SelfType& other) {
  76.  #include <sstream>
  77.  #include <utility>
  78.  #include <cstring>
  79. -//#include <cassert>
  80. +#include <cassert>
  81.  #ifdef JSON_USE_CPPTL
  82.  #include <cpptl/conststring.h>
  83.  #endif
  84. @@ -3659,9 +3659,6 @@ bool Value::removeMember(JSONCPP_STRING const& key, Value* removed)
  85.  {
  86.    return removeMember(key.data(), key.data() + key.length(), removed);
  87.  }
  88. -
  89. -#pragma GCC diagnostic push
  90. -#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
  91.  Value Value::removeMember(const char* key)
  92.  {
  93.    JSON_ASSERT_MESSAGE(type_ == nullValue || type_ == objectValue,
  94. @@ -3677,7 +3674,6 @@ Value Value::removeMember(const JSONCPP_STRING& key)
  95.  {
  96.    return removeMember(key.c_str());
  97.  }
  98. -#pragma GCC diagnostic pop
  99.  
  100.  bool Value::removeIndex(ArrayIndex index, Value* removed) {
  101.    if (type_ != arrayValue) {
  102. @@ -4164,7 +4160,7 @@ Value& Path::make(Value& root) const {
  103.  #include <sstream>
  104.  #include <utility>
  105.  #include <set>
  106. -//#include <cassert>
  107. +#include <cassert>
  108.  #include <cstring>
  109.  #include <cstdio>
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement