Replace the one use of CompileTimeAssert with static_assert (already …

…used elsewhere).
dolphin-emu · Sep 12, 2013 · b9c1af0 · b9c1af0
1 parent 9ee50a2
commit b9c1af0
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/Source/Core/Common/Src/CommonFuncs.h b/Source/Core/Common/Src/CommonFuncs.h
@@ -24,9 +24,6 @@ struct ArraySizeImpl<T[N], 0> { static const std::size_t size = N; };
 // Will fail to compile on a non-array:
 #define ArraySize(x) ArraySizeImpl<decltype(x)>::size
 
-template <bool> struct CompileTimeAssert;
-template<> struct CompileTimeAssert<true> {};
-
 #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
@@ -219,8 +219,7 @@ void PrintObject(const T &Obj)
 
 	// If this miscompiles, adjust the size of
 	// ZeldaVoicePB to 0x180 bytes (0xc0 shorts).
-	CompileTimeAssert<sizeof(ZeldaVoicePB) == 0x180> 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++)