From 72c13c8e776032f2c61df4195b3c311260996b0f Mon Sep 17 00:00:00 2001 From: Gymnasiast Date: Fri, 18 Sep 2020 23:31:09 +0200 Subject: [PATCH 1/2] Allow compilation with nlohmann/json < 3.9.0 --- src/openrct2/core/Json.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/openrct2/core/Json.cpp b/src/openrct2/core/Json.cpp index eb128106e0..20ed5f9b8e 100644 --- a/src/openrct2/core/Json.cpp +++ b/src/openrct2/core/Json.cpp @@ -32,7 +32,7 @@ namespace Json try { - json = json_t::parse(fileData, nullptr, true, true); + json = json_t::parse(fileData, nullptr, true); } catch (const json_t::exception& e) { @@ -58,7 +58,7 @@ namespace Json try { - json = json_t::parse(raw, nullptr, true, true); + json = json_t::parse(raw, nullptr, true); } catch (const json_t::exception& e) { From a896d238b1cc07abed8be16127849e2c37354acd Mon Sep 17 00:00:00 2001 From: Gymnasiast Date: Fri, 18 Sep 2020 23:46:07 +0200 Subject: [PATCH 2/2] Remove optional arguments to json_t::parse --- src/openrct2/core/Json.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/openrct2/core/Json.cpp b/src/openrct2/core/Json.cpp index 20ed5f9b8e..905c51b863 100644 --- a/src/openrct2/core/Json.cpp +++ b/src/openrct2/core/Json.cpp @@ -32,7 +32,7 @@ namespace Json try { - json = json_t::parse(fileData, nullptr, true); + json = json_t::parse(fileData); } catch (const json_t::exception& e) { @@ -58,7 +58,7 @@ namespace Json try { - json = json_t::parse(raw, nullptr, true); + json = json_t::parse(raw); } catch (const json_t::exception& e) {