mirror of
https://github.com/citra-mirror/citra.git
synced 2024-09-12 05:47:59 +02:00
Merge pull request #4852 from rerpha/compiler_warnings_room_member
Added default case for GetErrorStr, removed useless const declaration in header
This commit is contained in:
commit
45ff10c9a0
@ -150,8 +150,8 @@ public:
|
|||||||
* This may fail if the username or console ID is already taken.
|
* This may fail if the username or console ID is already taken.
|
||||||
*/
|
*/
|
||||||
void Join(const std::string& nickname, const std::string& console_id_hash,
|
void Join(const std::string& nickname, const std::string& console_id_hash,
|
||||||
const char* server_addr = "127.0.0.1", const u16 server_port = DefaultRoomPort,
|
const char* server_addr = "127.0.0.1", u16 server_port = DefaultRoomPort,
|
||||||
const u16 client_port = 0, const MacAddress& preferred_mac = NoPreferredMac,
|
u16 client_port = 0, const MacAddress& preferred_mac = NoPreferredMac,
|
||||||
const std::string& password = "", const std::string& token = "");
|
const std::string& password = "", const std::string& token = "");
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -305,8 +305,9 @@ inline const char* GetErrorStr(const RoomMember::Error& e) {
|
|||||||
return "PermissionDenied";
|
return "PermissionDenied";
|
||||||
case RoomMember::Error::NoSuchUser:
|
case RoomMember::Error::NoSuchUser:
|
||||||
return "NoSuchUser";
|
return "NoSuchUser";
|
||||||
}
|
default:
|
||||||
return "Unknown";
|
return "Unknown";
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
} // namespace Network
|
} // namespace Network
|
||||||
|
Loading…
Reference in New Issue
Block a user