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/Items/ItemAxe.h     | 1 +
 src/Items/ItemHoe.h     | 1 +
 src/Items/ItemPickaxe.h | 1 +
 src/Items/ItemShears.h  | 1 +
 src/Items/ItemShovel.h  | 1 +
 src/Items/ItemSword.h   | 1 +
 6 files changed, 6 insertions(+)

(limited to 'src/Items')

diff --git a/src/Items/ItemAxe.h b/src/Items/ItemAxe.h
index aeba22cf4..1dfd2aeca 100644
--- a/src/Items/ItemAxe.h
+++ b/src/Items/ItemAxe.h
@@ -27,6 +27,7 @@ public:
 			case dlaBreakBlock:         return 1;
 			case dlaBreakBlockInstant:  return 0;
 		}
+		UNREACHABLE("Unsupported durability loss action");
 	}
 
 
diff --git a/src/Items/ItemHoe.h b/src/Items/ItemHoe.h
index 8fe53c343..a0bf44a93 100644
--- a/src/Items/ItemHoe.h
+++ b/src/Items/ItemHoe.h
@@ -75,5 +75,6 @@ public:
 			case dlaBreakBlock:         return 0;
 			case dlaBreakBlockInstant:  return 0;
 		}
+		UNREACHABLE("Unsupported durability loss action");
 	}
 } ;
diff --git a/src/Items/ItemPickaxe.h b/src/Items/ItemPickaxe.h
index 84fa655fc..a23e9ec6d 100644
--- a/src/Items/ItemPickaxe.h
+++ b/src/Items/ItemPickaxe.h
@@ -26,6 +26,7 @@ public:
 			case dlaBreakBlock:         return 1;
 			case dlaBreakBlockInstant:  return 0;
 		}
+		UNREACHABLE("Unsupported durability loss action");
 	}
 
 
diff --git a/src/Items/ItemShears.h b/src/Items/ItemShears.h
index bebc85c92..6cbb37b2a 100644
--- a/src/Items/ItemShears.h
+++ b/src/Items/ItemShears.h
@@ -69,6 +69,7 @@ public:
 			case dlaBreakBlock:         return 0;
 			case dlaBreakBlockInstant:  return 1;
 		}
+		UNREACHABLE("Unsupported durability loss action");
 	}
 
 
diff --git a/src/Items/ItemShovel.h b/src/Items/ItemShovel.h
index a39e6ecac..49ecf3348 100644
--- a/src/Items/ItemShovel.h
+++ b/src/Items/ItemShovel.h
@@ -31,6 +31,7 @@ public:
 			case dlaBreakBlock:        return 1;
 			case dlaBreakBlockInstant: return 0;
 		}
+		UNREACHABLE("Unsupported durability loss action");
 	}
 
 
diff --git a/src/Items/ItemSword.h b/src/Items/ItemSword.h
index 773b84388..06543c37e 100644
--- a/src/Items/ItemSword.h
+++ b/src/Items/ItemSword.h
@@ -50,6 +50,7 @@ public:
 			case dlaBreakBlock:         return 2;
 			case dlaBreakBlockInstant:  return 0;
 		}
+		UNREACHABLE("Unsupported durability loss action");
 	}
 
 
-- 
cgit v1.2.3