diff options
| author | Loïc Blot <nerzhul@users.noreply.github.com> | 2017-09-26 20:30:14 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-26 20:30:14 +0200 |
| commit | 50423d8c729ee133035e3bb1e244bfbd1bdc0ef0 (patch) | |
| tree | 4605bc80aed2d0f729047697b23e709ade2510e5 /src/serverlist.cpp | |
| parent | f7e57a0d20879e1d1956e36d782a3ab98aa84e38 (diff) | |
| download | minetest-50423d8c729ee133035e3bb1e244bfbd1bdc0ef0.tar.gz minetest-50423d8c729ee133035e3bb1e244bfbd1bdc0ef0.tar.bz2 minetest-50423d8c729ee133035e3bb1e244bfbd1bdc0ef0.zip | |
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
Diffstat (limited to 'src/serverlist.cpp')
| -rw-r--r-- | src/serverlist.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
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<ServerListSpec> &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); } |