N-archive/citra
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #4852 from rerpha/compiler_warnings_room_member

Browse source 
Added default case for GetErrorStr, removed useless const declaration in header
This commit is contained in:
Pengfei Zhu 2019-07-25 08:41:03 +08:00 committed by GitHub
parent aef06df388 cb455fd410
commit 45ff10c9a0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/network/room_member.h
View file

@ -150,8 +150,8 @@ public:
* This may fail if the username or console ID is already taken.
*/
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 u16 client_port = 0, const MacAddress& preferred_mac = NoPreferredMac,
const char* server_addr = "127.0.0.1", u16 server_port = DefaultRoomPort,
u16 client_port = 0, const MacAddress& preferred_mac = NoPreferredMac,
const std::string& password = "", const std::string& token = "");
/**
@ -305,8 +305,9 @@ inline const char* GetErrorStr(const RoomMember::Error& e) {
return "PermissionDenied";
case RoomMember::Error::NoSuchUser:
return "NoSuchUser";
default:
return "Unknown";
}
return "Unknown";
}
} // namespace Network