From cb455fd41000ace51c22b4e47003c204a7a5817c Mon Sep 17 00:00:00 2001 From: Jack Harper Date: Tue, 23 Jul 2019 23:24:38 +0100 Subject: [PATCH] Added default case for GetErrorStr, removed useless const declaration in header --- src/network/room_member.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/network/room_member.h b/src/network/room_member.h index 4c26c35b29..a7c4a717af 100644 --- a/src/network/room_member.h +++ b/src/network/room_member.h @@ -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