From 76f805fe9cbbdf3edd20863381dde6fb5b6120f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Kr=C3=B6ning?= <mkroening@posteo.net>
Date: Thu, 18 Jun 2020 20:35:17 +0200
Subject: [PATCH] jsoncpp: Reset existing files to svn-release-0.5.0

---
 extern/jsoncpp/include/json/value.h         | 7 -------
 extern/jsoncpp/src/lib_json/json_reader.cpp | 7 +++----
 extern/jsoncpp/src/lib_json/json_value.cpp  | 6 +++---
 extern/jsoncpp/src/lib_json/json_writer.cpp | 8 ++++----
 4 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/extern/jsoncpp/include/json/value.h b/extern/jsoncpp/include/json/value.h
index 0cf4ca76cf..58bfd88e7a 100644
--- a/extern/jsoncpp/include/json/value.h
+++ b/extern/jsoncpp/include/json/value.h
@@ -234,13 +234,6 @@ namespace Json {
       double asDouble() const;
       bool asBool() const;
 
-      bool TryGet( std::string &out ) const { if(!isString()) return false; out=asString(); return true; }
-      bool TryGet( int &out ) const { if(!isInt()) return false; out=asInt(); return true; }
-      bool TryGet( UInt &out ) const { if(!isUInt()) return false; out=asUInt(); return true; }
-      bool TryGet( double &out ) const { if(!isDouble()) return false; out=asDouble(); return true; }
-      bool TryGet( float &out ) const { if(!isDouble()) return false; out=(float)asDouble(); return true; }
-      bool TryGet( bool &out ) const { if(!isBool()) return false; out=asBool(); return true; }
-
       bool isNull() const;
       bool isBool() const;
       bool isInt() const;
diff --git a/extern/jsoncpp/src/lib_json/json_reader.cpp b/extern/jsoncpp/src/lib_json/json_reader.cpp
index 3e79ab733e..4eb2d11fd3 100644
--- a/extern/jsoncpp/src/lib_json/json_reader.cpp
+++ b/extern/jsoncpp/src/lib_json/json_reader.cpp
@@ -1,5 +1,5 @@
-#include "json/reader.h"
-#include "json/value.h"
+#include <json/reader.h>
+#include <json/value.h>
 #include <utility>
 #include <cstdio>
 #include <cassert>
@@ -877,8 +877,7 @@ std::istream& operator>>( std::istream &sin, Value &root )
     Json::Reader reader;
     bool ok = reader.parse(sin, root, true);
     //JSON_ASSERT( ok );
-//    if (!ok) throw std::runtime_error(reader.getFormatedErrorMessages());
-    assert(ok);
+    if (!ok) throw std::runtime_error(reader.getFormatedErrorMessages());
     return sin;
 }
 
diff --git a/extern/jsoncpp/src/lib_json/json_value.cpp b/extern/jsoncpp/src/lib_json/json_value.cpp
index 1ecacd45d0..573205f13e 100644
--- a/extern/jsoncpp/src/lib_json/json_value.cpp
+++ b/extern/jsoncpp/src/lib_json/json_value.cpp
@@ -1,6 +1,6 @@
 #include <iostream>
-#include "json/value.h"
-#include "json/writer.h"
+#include <json/value.h>
+#include <json/writer.h>
 #include <utility>
 #include <stdexcept>
 #include <cstring>
@@ -15,7 +15,7 @@
 
 #define JSON_ASSERT_UNREACHABLE assert( false )
 #define JSON_ASSERT( condition ) assert( condition );  // @todo <= change this into an exception throw
-#define JSON_ASSERT_MESSAGE( condition, message ) if (!( condition )) assert(false); /* throw std::runtime_error( message ); */
+#define JSON_ASSERT_MESSAGE( condition, message ) if (!( condition )) throw std::runtime_error( message );
 
 namespace Json {
 
diff --git a/extern/jsoncpp/src/lib_json/json_writer.cpp b/extern/jsoncpp/src/lib_json/json_writer.cpp
index 8412670e2f..cdf4188f2e 100644
--- a/extern/jsoncpp/src/lib_json/json_writer.cpp
+++ b/extern/jsoncpp/src/lib_json/json_writer.cpp
@@ -1,4 +1,4 @@
-#include "json/writer.h"
+#include <json/writer.h>
 #include <utility>
 #include <assert.h>
 #include <stdio.h>
@@ -111,7 +111,7 @@ std::string valueToString( bool value )
 std::string valueToQuotedString( const char *value )
 {
    // Not sure how to handle unicode...
-   if (strpbrk(value, "\"\\\b\f\n\r\t") == nullptr && !containsControlCharacter( value ))
+   if (strpbrk(value, "\"\\\b\f\n\r\t") == NULL && !containsControlCharacter( value ))
       return std::string("\"") + value + "\"";
    // We have to walk value and escape any special characters.
    // Appending to std::string is not efficient, but this should be rare.
@@ -542,7 +542,7 @@ StyledWriter::normalizeEOL( const std::string &text )
 // //////////////////////////////////////////////////////////////////
 
 StyledStreamWriter::StyledStreamWriter( std::string indentation )
-   : document_(nullptr)
+   : document_(NULL)
    , rightMargin_( 74 )
    , indentation_( indentation )
 {
@@ -559,7 +559,7 @@ StyledStreamWriter::write( std::ostream &out, const Value &root )
    writeValue( root );
    writeCommentAfterValueOnSameLine( root );
    *document_ << "\n";
-   document_ = nullptr; // Forget the stream, for safety.
+   document_ = NULL; // Forget the stream, for safety.
 }