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/Generating/PiecePool.cpp | 25 +++++-------------------- 1 file changed, 5 insertions(+), 20 deletions(-) (limited to 'src/Generating/PiecePool.cpp') diff --git a/src/Generating/PiecePool.cpp b/src/Generating/PiecePool.cpp index 201c70afd..4b4303516 100644 --- a/src/Generating/PiecePool.cpp +++ b/src/Generating/PiecePool.cpp @@ -200,10 +200,7 @@ Vector3i cPiece::cConnector::AddDirection(const Vector3i & a_Pos, eDirection a_D case dirYP_XP_ZM: return Vector3i(a_Pos.x, a_Pos.y + 1, a_Pos.z); case dirYP_XP_ZP: return Vector3i(a_Pos.x, a_Pos.y + 1, a_Pos.z); } - #if !defined(__clang__) - ASSERT(!"Unknown connector direction"); - return a_Pos; - #endif + UNREACHABLE("Unsupported connector direction"); } @@ -229,10 +226,7 @@ const char * cPiece::cConnector::DirectionToString(eDirection a_Direction) case dirYP_XP_ZM: return "y+x+z-"; case dirYP_XP_ZP: return "y+x+z+"; } - #if !defined(__clang__) - ASSERT(!"Unknown connector direction"); - return ""; - #endif + UNREACHABLE("Unsupported connector direction"); } @@ -288,10 +282,7 @@ cPiece::cConnector::eDirection cPiece::cConnector::RotateDirection(eDirection a_ case dirYP_XP_ZM: return dirYP_XM_ZP; case dirYP_XP_ZP: return dirYP_XM_ZM; } - #if !defined(__clang__) - ASSERT(!"Unknown connector direction"); - return a_Direction; - #endif + UNREACHABLE("Unsupported connector direction"); } @@ -318,10 +309,7 @@ cPiece::cConnector::eDirection cPiece::cConnector::RotateDirectionCCW(eDirection case dirYP_XP_ZM: return dirYP_XM_ZM; case dirYP_XP_ZP: return dirYP_XP_ZM; } - #if !defined(__clang__) - ASSERT(!"Unknown connector direction"); - return a_Direction; - #endif + UNREACHABLE("Unsupported connector direction"); } @@ -348,10 +336,7 @@ cPiece::cConnector::eDirection cPiece::cConnector::RotateDirectionCW(eDirection case dirYP_XP_ZM: return dirYP_XP_ZP; case dirYP_XP_ZP: return dirYP_XM_ZP; } - #if !defined(__clang__) - ASSERT(!"Unknown connector direction"); - return a_Direction; - #endif + UNREACHABLE("Unsupported connector direction"); } -- cgit v1.2.3