livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Linux: switch to boost::json

master
Zi Ree 2024-06-06 18:12:56 +02:00
parent 1a8a54049d
commit 6edfe9b3c5
1 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
indra/newview/llappviewerlinux.cpp
View File

@ -69,15 +69,9 @@ extern "C"
#include "breakpad/common/linux/http_upload.h"
#include "lldir.h"
#include "../llcrashlogger/llcrashlogger.h"
// <FS:LO> Fix linux compile
#if LL_USESYSTEMLIBS
#include "jsoncpp/reader.h" // JSON
#else
#include "json/reader.h" // JSON
#endif
// </FS:LO>
#endif
#include "boost/json.hpp"
#include "fsversionvalues.h"
#define VIEWERAPI_SERVICE "com.secondlife.ViewerAppAPIService"
@ -189,26 +183,28 @@ void setupBreadpad()
return;
}
Json::Reader reader;
Json::Value build_data;
if(!reader.parse(inf, build_data, false))
boost::json::error_code ec;
boost::json::value build_data = boost::json::parse(inf, ec);
if(ec.failed())
{
LL_WARNS("BUGSPLAT") << "Can't initialize BugSplat, can't parse '" << build_data_fname << "': "
<< reader.getFormatedErrorMessages() << LL_ENDL;
<< ec.what() << LL_ENDL;
return;
}
Json::Value BugSplat_DB = build_data["BugSplat DB"];
if(!BugSplat_DB)
if (!build_data.is_object() || !build_data.as_object().contains("BugSplat DB"))
{
LL_WARNS("BUGSPLAT") << "Can't initialize BugSplat, no 'BugSplat DB' entry in '" << build_data_fname
<< "'" << LL_ENDL;
return;
}
gVersion = STRINGIZE(
LL_VIEWER_VERSION_MAJOR << '.' << LL_VIEWER_VERSION_MINOR << '.' << LL_VIEWER_VERSION_PATCH
<< '.' << LL_VIEWER_VERSION_BUILD);
gBugsplatDB = BugSplat_DB.asString();
boost::json::value BugSplat_DB = build_data.at("BugSplat DB");
gBugsplatDB = boost::json::value_to<std::string>(BugSplat_DB);
LL_INFOS("BUGSPLAT") << "Initializing with crash logger: " << gCrashLogger << " database: " << gBugsplatDB << " version: " << gVersion << LL_ENDL;