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/Defines.h | 32 ++++++++------------------------
 1 file changed, 8 insertions(+), 24 deletions(-)

(limited to 'src/Defines.h')

diff --git a/src/Defines.h b/src/Defines.h
index 7a7f4c598..758c416e8 100644
--- a/src/Defines.h
+++ b/src/Defines.h
@@ -277,8 +277,7 @@ inline const char * ClickActionToString(int a_ClickAction)
 
 		case caUnknown:                      return "caUnknown";
 	}
-	ASSERT(!"Unknown click action");
-	return "caUnknown";
+	UNREACHABLE("Unknown click action");
 }
 
 
@@ -299,12 +298,9 @@ inline eBlockFace MirrorBlockFaceY(eBlockFace a_BlockFace)
 		case BLOCK_FACE_YP:
 		{
 			return a_BlockFace;
-		};
+		}
 	}
-	#if !defined(__clang__)
-		ASSERT(!"Unknown BLOCK_FACE");
-		return a_BlockFace;
-	#endif
+	UNREACHABLE("Unsupported block face");
 }
 
 
@@ -327,10 +323,7 @@ inline eBlockFace RotateBlockFaceCCW(eBlockFace a_BlockFace)
 			return a_BlockFace;
 		}
 	}
-	#if !defined(__clang__)
-		ASSERT(!"Unknown BLOCK_FACE");
-		return a_BlockFace;
-	#endif
+	UNREACHABLE("Unsupported block face");
 }
 
 
@@ -350,12 +343,9 @@ inline eBlockFace RotateBlockFaceCW(eBlockFace a_BlockFace)
 		case BLOCK_FACE_YP:
 		{
 			return a_BlockFace;
-		};
+		}
 	}
-	#if !defined(__clang__)
-		ASSERT(!"Unknown BLOCK_FACE");
-		return a_BlockFace;
-	#endif
+	UNREACHABLE("Unsupported block face");
 }
 
 
@@ -374,10 +364,7 @@ inline eBlockFace ReverseBlockFace(eBlockFace  a_BlockFace)
 		case BLOCK_FACE_ZM:   return BLOCK_FACE_ZP;
 		case BLOCK_FACE_NONE: return a_BlockFace;
 	}
-	#if !defined(__clang__)
-		ASSERT(!"Unknown BLOCK_FACE");
-		return a_BlockFace;
-	#endif
+	UNREACHABLE("Unsupported block face");
 }
 
 
@@ -397,10 +384,7 @@ inline AString BlockFaceToString(eBlockFace a_BlockFace)
 		case BLOCK_FACE_ZP: return "BLOCK_FACE_ZP";
 		case BLOCK_FACE_NONE: return "BLOCK_FACE_NONE";
 	}
-	// clang optimisises this line away then warns that it has done so.
-	#if !defined(__clang__)
-		return Printf("Unknown BLOCK_FACE: %d", a_BlockFace);
-	#endif
+	UNREACHABLE("Unsupported block face");
 }
 
 
-- 
cgit v1.2.3