diff options
| author | Tiger Wang <ziwei.tiger@outlook.com> | 2021-02-20 17:24:13 +0100 |
|---|---|---|
| committer | Tiger Wang <ziwei.tiger@outlook.com> | 2021-02-20 18:46:02 +0100 |
| commit | 81e299f00ce3df587166ccc94f5997555cce5210 (patch) | |
| tree | d5954c7f5756b67b2c6c1f7c6f2b635f5337eef2 /src/Blocks | |
| parent | Clang 7? (diff) | |
| download | cuberite-81e299f00ce3df587166ccc94f5997555cce5210.tar cuberite-81e299f00ce3df587166ccc94f5997555cce5210.tar.gz cuberite-81e299f00ce3df587166ccc94f5997555cce5210.tar.bz2 cuberite-81e299f00ce3df587166ccc94f5997555cce5210.tar.lz cuberite-81e299f00ce3df587166ccc94f5997555cce5210.tar.xz cuberite-81e299f00ce3df587166ccc94f5997555cce5210.tar.zst cuberite-81e299f00ce3df587166ccc94f5997555cce5210.zip | |
Diffstat (limited to 'src/Blocks')
| -rw-r--r-- | src/Blocks/BlockButton.h | 8 | ||||
| -rw-r--r-- | src/Blocks/BlockCocoaPod.h | 3 | ||||
| -rw-r--r-- | src/Blocks/BlockHandler.cpp | 1 | ||||
| -rw-r--r-- | src/Blocks/BlockSideways.h | 3 | ||||
| -rw-r--r-- | src/Blocks/BlockTripwireHook.h | 1 |
5 files changed, 5 insertions, 11 deletions
diff --git a/src/Blocks/BlockButton.h b/src/Blocks/BlockButton.h index 062bd5057..985c1fff9 100644 --- a/src/Blocks/BlockButton.h +++ b/src/Blocks/BlockButton.h @@ -132,8 +132,7 @@ private: case BLOCK_FACE_YM: return 0x0; case BLOCK_FACE_NONE: { - ASSERT(!"Unhandled block face!"); - return 0x0; + break; } } UNREACHABLE("Unsupported block face"); @@ -265,10 +264,9 @@ private: case BLOCK_FACE_YP: return { 0.5, 0, 0.5 }; case BLOCK_FACE_NONE: { - ASSERT(!"Unhandled block face!"); - return { 0, 0, 0 }; + break; } } - UNREACHABLE(!"Unhandled block face!"); + UNREACHABLE("Unhandled block face!"); } } ; diff --git a/src/Blocks/BlockCocoaPod.h b/src/Blocks/BlockCocoaPod.h index d78164ea6..caff5c028 100644 --- a/src/Blocks/BlockCocoaPod.h +++ b/src/Blocks/BlockCocoaPod.h @@ -28,8 +28,7 @@ public: case BLOCK_FACE_YM: case BLOCK_FACE_YP: { - ASSERT(!"Unknown face"); - return 0; + break; } } UNREACHABLE("Unsupported block face"); diff --git a/src/Blocks/BlockHandler.cpp b/src/Blocks/BlockHandler.cpp index 0e1672ce8..71169ea7f 100644 --- a/src/Blocks/BlockHandler.cpp +++ b/src/Blocks/BlockHandler.cpp @@ -936,6 +936,5 @@ const cBlockHandler & cBlockHandler::For(BLOCKTYPE a_BlockType) case E_BLOCK_NUMBER_OF_TYPES: case E_BLOCK_UNFINISHED: return BlockAirHandler; } - UNREACHABLE("Getting handler for unexpected block type"); } diff --git a/src/Blocks/BlockSideways.h b/src/Blocks/BlockSideways.h index a8eb52fc6..a6e035601 100644 --- a/src/Blocks/BlockSideways.h +++ b/src/Blocks/BlockSideways.h @@ -74,8 +74,7 @@ private: case BLOCK_FACE_NONE: { - ASSERT(!"Unhandled block face!"); - return a_Meta | 0xC; // No idea, give a special meta + break; } } UNREACHABLE("Unsupported block face"); diff --git a/src/Blocks/BlockTripwireHook.h b/src/Blocks/BlockTripwireHook.h index 0d46da437..0d58bb084 100644 --- a/src/Blocks/BlockTripwireHook.h +++ b/src/Blocks/BlockTripwireHook.h @@ -70,7 +70,6 @@ private: return false; } } - UNREACHABLE("Unsupported block face"); } |