INSANEMODE/yuzu-android
1
0
Fork 0
mirror of https://github.com/yuzu-emu/yuzu-android.git synced 2025-06-11 17:28:04 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix compilation on linux gcc

Browse Source
This commit is contained in:
FearlessTobi
2022-07-11 20:40:57 +02:00
parent ee5cb9c7b9
commit ec407bd3f1
6 changed files with 32 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/web_service/announce_room_json.cpp
View File

@ -11,7 +11,7 @@
namespace AnnounceMultiplayerRoom {
void to_json(nlohmann::json& json, const Room::Member& member) {
static void to_json(nlohmann::json& json, const Room::Member& member) {
if (!member.username.empty()) {
json["username"] = member.username;
}
@ -23,7 +23,7 @@ void to_json(nlohmann::json& json, const Room::Member& member) {
json["gameId"] = member.game_id;
}
void from_json(const nlohmann::json& json, Room::Member& member) {
static void from_json(const nlohmann::json& json, Room::Member& member) {
member.nickname = json.at("nickname").get<std::string>();
member.game_name = json.at("gameName").get<std::string>();
member.game_id = json.at("gameId").get<u64>();
@ -36,7 +36,7 @@ void from_json(const nlohmann::json& json, Room::Member& member) {
}
}
void to_json(nlohmann::json& json, const Room& room) {
static void to_json(nlohmann::json& json, const Room& room) {
json["port"] = room.port;
json["name"] = room.name;
if (!room.description.empty()) {
@ -53,7 +53,7 @@ void to_json(nlohmann::json& json, const Room& room) {
}
}
void from_json(const nlohmann::json& json, Room& room) {
static void from_json(const nlohmann::json& json, Room& room) {
room.verify_UID = json.at("externalGuid").get<std::string>();
room.ip = json.at("address").get<std::string>();
room.name = json.at("name").get<std::string>();

4
src/web_service/announce_room_json.h
View File

@ -17,8 +17,8 @@ namespace WebService {
*/
class RoomJson : public AnnounceMultiplayerRoom::Backend {
public:
RoomJson(const std::string& host, const std::string& username, const std::string& token)
: client(host, username, token), host(host), username(username), token(token) {}
RoomJson(const std::string& host_, const std::string& username_, const std::string& token_)
: client(host_, username_, token_), host(host_), username(username_), token(token_) {}
~RoomJson() = default;
void SetRoomInformation(const std::string& name, const std::string& description, const u16 port,
const u32 max_player, const u32 net_version, const bool has_password,