From d3c1c626f569e5aa58085425924cca45927b6199 Mon Sep 17 00:00:00 2001
From: peterbell10 <peterbell10@live.co.uk>
Date: Sun, 4 Feb 2018 23:07:12 +0000
Subject: Deal with covered switches consistently (#4161)

* Fixes a number of "<function>: 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/BlockID.cpp | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

(limited to 'src/BlockID.cpp')

diff --git a/src/BlockID.cpp b/src/BlockID.cpp
index a6f846911..acba8db27 100644
--- a/src/BlockID.cpp
+++ b/src/BlockID.cpp
@@ -388,12 +388,7 @@ AString DamageTypeToString(eDamageType a_DamageType)
 		case dtSuffocating:     return "dtSuffocation";
 		case dtExplosion:       return "dtExplosion";
 	}
-
-	// Unknown damage type:
-	ASSERT(!"Unknown DamageType");
-	#ifndef __clang__
-		return Printf("dtUnknown_%d", static_cast<int>(a_DamageType));
-	#endif
+	UNREACHABLE("Unsupported damage type");
 }
 
 
-- 
cgit v1.2.3