From d3c1c626f569e5aa58085425924cca45927b6199 Mon Sep 17 00:00:00 2001 From: peterbell10 Date: Sun, 4 Feb 2018 23:07:12 +0000 Subject: Deal with covered switches consistently (#4161) * Fixes a number of ": not all control paths return a value" warnings on MSVC. * Introduces the UNREACHABLE global macro and uses it instead of conditionally compiled switch defaults. * Move cNBTParseErrorCategory from FastNBT.h into FastNBT.cpp to prevent bad calls to message() --- src/Protocol/PacketID.cpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'src/Protocol/PacketID.cpp') diff --git a/src/Protocol/PacketID.cpp b/src/Protocol/PacketID.cpp index f401f856e..47d274f25 100644 --- a/src/Protocol/PacketID.cpp +++ b/src/Protocol/PacketID.cpp @@ -79,11 +79,7 @@ UInt32 cProtocol_1_9_0::GetPacketId(eOutgoingPackets a_Packet) case sendWindowOpen: return 0x13; case sendWindowProperty: return 0x15; } - ASSERT(!"Retrieving packet ID for unknown packet type"); - #ifndef __clang__ - LOGWARNING("Retrieving packet ID for unknown packet type %d!", a_Packet); - return 0; - #endif + UNREACHABLE("Unsupported outgoing packet type"); } -- cgit v1.2.3