summaryrefslogtreecommitdiff
path: root/src/web_service/announce_room_json.cpp
diff options
context:
space:
mode:
authorGravatar FearlessTobi2022-07-11 20:40:57 +0200
committerGravatar FearlessTobi2022-07-25 21:59:30 +0200
commitec407bd3f1988c6f5d147307c662703c7bc94751 (patch)
tree8792652886c6b9250bea7e609b9828d9a94d3e31 /src/web_service/announce_room_json.cpp
parentweb_service: Fix -Wmissing-field-initializers (diff)
downloadyuzu-ec407bd3f1988c6f5d147307c662703c7bc94751.tar.gz
yuzu-ec407bd3f1988c6f5d147307c662703c7bc94751.tar.xz
yuzu-ec407bd3f1988c6f5d147307c662703c7bc94751.zip
Fix compilation on linux gcc
Diffstat (limited to 'src/web_service/announce_room_json.cpp')
-rw-r--r--src/web_service/announce_room_json.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/web_service/announce_room_json.cpp b/src/web_service/announce_room_json.cpp
index 32249f28e..984a59f77 100644
--- a/src/web_service/announce_room_json.cpp
+++ b/src/web_service/announce_room_json.cpp
@@ -11,7 +11,7 @@
11 11
12namespace AnnounceMultiplayerRoom { 12namespace AnnounceMultiplayerRoom {
13 13
14void to_json(nlohmann::json& json, const Room::Member& member) { 14static void to_json(nlohmann::json& json, const Room::Member& member) {
15 if (!member.username.empty()) { 15 if (!member.username.empty()) {
16 json["username"] = member.username; 16 json["username"] = member.username;
17 } 17 }
@@ -23,7 +23,7 @@ void to_json(nlohmann::json& json, const Room::Member& member) {
23 json["gameId"] = member.game_id; 23 json["gameId"] = member.game_id;
24} 24}
25 25
26void from_json(const nlohmann::json& json, Room::Member& member) { 26static void from_json(const nlohmann::json& json, Room::Member& member) {
27 member.nickname = json.at("nickname").get<std::string>(); 27 member.nickname = json.at("nickname").get<std::string>();
28 member.game_name = json.at("gameName").get<std::string>(); 28 member.game_name = json.at("gameName").get<std::string>();
29 member.game_id = json.at("gameId").get<u64>(); 29 member.game_id = json.at("gameId").get<u64>();
@@ -36,7 +36,7 @@ void from_json(const nlohmann::json& json, Room::Member& member) {
36 } 36 }
37} 37}
38 38
39void to_json(nlohmann::json& json, const Room& room) { 39static void to_json(nlohmann::json& json, const Room& room) {
40 json["port"] = room.port; 40 json["port"] = room.port;
41 json["name"] = room.name; 41 json["name"] = room.name;
42 if (!room.description.empty()) { 42 if (!room.description.empty()) {
@@ -53,7 +53,7 @@ void to_json(nlohmann::json& json, const Room& room) {
53 } 53 }
54} 54}
55 55
56void from_json(const nlohmann::json& json, Room& room) { 56static void from_json(const nlohmann::json& json, Room& room) {
57 room.verify_UID = json.at("externalGuid").get<std::string>(); 57 room.verify_UID = json.at("externalGuid").get<std::string>();
58 room.ip = json.at("address").get<std::string>(); 58 room.ip = json.at("address").get<std::string>();
59 room.name = json.at("name").get<std::string>(); 59 room.name = json.at("name").get<std::string>();