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/Blocks/BlockQuartz.h | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'src/Blocks/BlockQuartz.h') diff --git a/src/Blocks/BlockQuartz.h b/src/Blocks/BlockQuartz.h index c2435cd5e..c87240cf1 100644 --- a/src/Blocks/BlockQuartz.h +++ b/src/Blocks/BlockQuartz.h @@ -63,10 +63,7 @@ public: return a_QuartzMeta; // No idea, give a special meta (all sides the same) } } - #if !defined(__clang__) - ASSERT(!"Unknown BLOCK_FACE"); - return 0; - #endif + UNREACHABLE("Unsupported block face"); } virtual ColourID GetMapBaseColourID(NIBBLETYPE a_Meta) override -- cgit v1.2.3