From da8e8b1f1f84adf8483da93dfabcf203364ec0d2 Mon Sep 17 00:00:00 2001
From: kdesnos <kdesnos@insa-rennes.fr>
Date: Fri, 26 Feb 2021 15:58:47 +0100
Subject: [PATCH] (Releng) Attempt cross-platform fix. (previous solution was
 breaking build everywhere but on MacOS)

---
 lib/JsonCpp/json.h      | 11 ++++++++---
 lib/JsonCpp/jsoncpp.cpp | 14 --------------
 2 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/lib/JsonCpp/json.h b/lib/JsonCpp/json.h
index 76fd823f..1e9fa868 100644
--- a/lib/JsonCpp/json.h
+++ b/lib/JsonCpp/json.h
@@ -839,11 +839,16 @@ class JSON_API Value {
    */
   Value(ValueType type = nullValue);
   Value(Int value);
-  Value(UInt value);
-  Value(size_t value);
+  
+  // Portable support for uint, uint64_t, size_t
+  template <typename T>
+  Value(T value) {
+      initBasic(uintValue);
+      value_.uint_ = value;
+  }
+
 #if defined(JSON_HAS_INT64)
   Value(Int64 value);
-  Value(UInt64 value);
 #endif // if defined(JSON_HAS_INT64)
   Value(double value);
   Value(const char* value); ///< Copy til first 0. (NULL causes to seg-fault.)
diff --git a/lib/JsonCpp/jsoncpp.cpp b/lib/JsonCpp/jsoncpp.cpp
index 0e5a1c65..4578dc78 100644
--- a/lib/JsonCpp/jsoncpp.cpp
+++ b/lib/JsonCpp/jsoncpp.cpp
@@ -2789,25 +2789,11 @@ Value::Value(Int value) {
   value_.int_ = value;
 }
 
-Value::Value(UInt value) {
-  initBasic(uintValue);
-  value_.uint_ = value;
-}
-
-Value::Value(size_t value)
-{
-    initBasic(uintValue);
-    value_.uint_ = value;
-}
 #if defined(JSON_HAS_INT64)
 Value::Value(Int64 value) {
   initBasic(intValue);
   value_.int_ = value;
 }
-Value::Value(UInt64 value) {
-  initBasic(uintValue);
-  value_.uint_ = value;
-}
 #endif // defined(JSON_HAS_INT64)
 
 Value::Value(double value) {