diff --git a/Source/Core/Common/Src/CommonFuncs.h b/Source/Core/Common/Src/CommonFuncs.h index 90ed639deb..284302d70d 100644 --- a/Source/Core/Common/Src/CommonFuncs.h +++ b/Source/Core/Common/Src/CommonFuncs.h @@ -24,9 +24,6 @@ struct ArraySizeImpl { static const std::size_t size = N; }; // Will fail to compile on a non-array: #define ArraySize(x) ArraySizeImpl::size -template struct CompileTimeAssert; -template<> struct CompileTimeAssert {}; - #define b2(x) ( (x) | ( (x) >> 1) ) #define b4(x) ( b2(x) | ( b2(x) >> 2) ) #define b8(x) ( b4(x) | ( b4(x) >> 4) ) diff --git a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_Zelda_Voice.cpp b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_Zelda_Voice.cpp index a684bb0c02..9c3fedddb3 100644 --- a/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_Zelda_Voice.cpp +++ b/Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_Zelda_Voice.cpp @@ -219,8 +219,7 @@ void PrintObject(const T &Obj) // If this miscompiles, adjust the size of // ZeldaVoicePB to 0x180 bytes (0xc0 shorts). - CompileTimeAssert ensure_zpb_size_correct; - (void)ensure_zpb_size_correct; + static_assert(sizeof(ZeldaVoicePB) == 0x180, "ZeldaVoicePB incorrectly defined."); ss << std::hex; for (size_t i = 0; i < sizeof(T); i++)