From 50423d8c729ee133035e3bb1e244bfbd1bdc0ef0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Blot?= Date: Tue, 26 Sep 2017 20:30:14 +0200 Subject: Update JsonCPP to 1.8.3 (#6466) * Update JsonCPP to 1.8.3 * Fix deprecated functions Json::FastWriter, Json::StyledWriter and Json::Reader are marked deprecated since 1.1 and are deprecated in 0.8 but not shown at compilation time. Use new methods to serialize/deserialize --- src/serverlist.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src/serverlist.cpp') diff --git a/src/serverlist.cpp b/src/serverlist.cpp index a59a89369..7d3ab4bbb 100644 --- a/src/serverlist.cpp +++ b/src/serverlist.cpp @@ -185,8 +185,8 @@ const std::string serializeJson(const std::vector &serverlist) list.append(it); } root["list"] = list; - Json::FastWriter writer; - return writer.write(root); + + return fastWriteJson(root); } @@ -249,10 +249,9 @@ void sendAnnounce(AnnounceAction action, server["lag"] = lag; } - Json::FastWriter writer; HTTPFetchRequest fetch_request; fetch_request.url = g_settings->get("serverlist_url") + std::string("/announce"); - fetch_request.post_fields["json"] = writer.write(server); + fetch_request.post_fields["json"] = fastWriteJson(server); fetch_request.multipart = true; httpfetch_async(fetch_request); } -- cgit v1.2.3