mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Allow compilation with nlohmann/json < 3.9.0 

According to the [API docs](https://github.com/nlohmann/json/blob/develop/single_include/nlohmann/json.hpp#L23219-L23222), the fourth argument (which allows ignoring comments) was only introduced in version 3.9.0 (released on 27 July 2020), which is not present in Ubuntu 20.04 (it only has 3.7.3-1).

Since comments are not part of the JSON spec, this option is not terribly useful anyway. I have removed it, so that it can now compile on Ubuntu 20.04, and possibly also earlier versions.
This commit is contained in:
Michael Steenbeek 2020-09-19 00:19:39 +02:00 committed by GitHub
parent 77e22851cc a896d238b1
commit fd194d0e32
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/openrct2/core/Json.cpp
View File

@ -32,7 +32,7 @@ namespace Json
try
{
json = json_t::parse(fileData, nullptr, true, 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, true);
json = json_t::parse(raw);
}
catch (const json_t::exception& e)
{