From 3edae70ea0bbede6d9ed57a91af9532101bd7ef8 Mon Sep 17 00:00:00 2001 From: Soren Jorvang Date: Wed, 26 May 2010 20:47:56 +0000 Subject: [PATCH] Hack this dodgy compile-time assert so it works with gcc. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5486 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Core/Common/Src/Common.h | 2 +- Source/Plugins/Plugin_DSP_HLE/Src/UCodes/UCode_Zelda.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Core/Common/Src/Common.h b/Source/Core/Common/Src/Common.h index b254076165..aa2f01b662 100644 --- a/Source/Core/Common/Src/Common.h +++ b/Source/Core/Common/Src/Common.h @@ -94,7 +94,7 @@ #ifndef _SECURE_SCL #error Please define _SECURE_SCL=0 in the project settings #else - CompileTimeAssert<_SECURE_SCL==0> EnsureNoSecureSCL; + CompileTimeAssert<_SECURE_SCL==0> volatile EnsureNoSecureSCL; #endif } diff --git a/Source/Plugins/Plugin_DSP_HLE/Src/UCodes/UCode_Zelda.h b/Source/Plugins/Plugin_DSP_HLE/Src/UCodes/UCode_Zelda.h index 1d6d060c44..d69c7267f6 100644 --- a/Source/Plugins/Plugin_DSP_HLE/Src/UCodes/UCode_Zelda.h +++ b/Source/Plugins/Plugin_DSP_HLE/Src/UCodes/UCode_Zelda.h @@ -130,7 +130,7 @@ union ZeldaUnkPB namespace { // If this miscompiles, adjust the size of ZeldaVoicePB to 0x180 bytes (0xc0 shorts). - CompileTimeAssert ensure_zpb_size_correct; + CompileTimeAssert volatile ensure_zpb_size_correct; } // namespace class CUCode_Zelda : public IUCode