diff options
| author | Lioncash <mathew1800@gmail.com> | 2014-07-03 22:16:07 -0400 |
|---|---|---|
| committer | Lioncash <mathew1800@gmail.com> | 2014-07-03 22:16:07 -0400 |
| commit | 32e45e6abef8bbded4bd71fb327e5a4ff7ae3038 (patch) | |
| tree | 73a79f69d7971260b9ce7cc7fc48544421805cff | |
| parent | be1fe80bb63ff98dab206b8ac3a7f1924042d814 (diff) | |
| parent | 20dc0e78191f0bc2385253c9c8a565793a976fe0 (diff) | |
Merge pull request #556 from Tilka/fix_warnings
Fix warnings
| -rw-r--r-- | Source/Core/AudioCommon/Mixer.h | 2 | ||||
| -rw-r--r-- | Source/Core/Core/PowerPC/JitCommon/Jit_Util.cpp | 3 | ||||
| -rw-r--r-- | Source/Core/DiscIO/BannerLoader.h | 4 |
3 files changed, 3 insertions, 6 deletions
diff --git a/Source/Core/AudioCommon/Mixer.h b/Source/Core/AudioCommon/Mixer.h index 6400cf8da4..d1096b2eb0 100644 --- a/Source/Core/AudioCommon/Mixer.h +++ b/Source/Core/AudioCommon/Mixer.h @@ -88,9 +88,9 @@ protected: , m_input_sample_rate(sample_rate) , m_indexW(0) , m_indexR(0) - , m_numLeftI(0.0f) , m_LVolume(256) , m_RVolume(256) + , m_numLeftI(0.0f) { memset(m_buffer, 0, sizeof(m_buffer)); } diff --git a/Source/Core/Core/PowerPC/JitCommon/Jit_Util.cpp b/Source/Core/Core/PowerPC/JitCommon/Jit_Util.cpp index 58348d19cb..3c8eababe1 100644 --- a/Source/Core/Core/PowerPC/JitCommon/Jit_Util.cpp +++ b/Source/Core/Core/PowerPC/JitCommon/Jit_Util.cpp @@ -13,9 +13,6 @@ using namespace Gen; -static const u8 GC_ALIGNED16(pbswapShuffle1x4[16]) = {3, 2, 1, 0, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15}; -static u32 GC_ALIGNED16(float_buffer); - void EmuCodeBlock::LoadAndSwap(int size, Gen::X64Reg dst, const Gen::OpArg& src) { if (cpu_info.bMOVBE) diff --git a/Source/Core/DiscIO/BannerLoader.h b/Source/Core/DiscIO/BannerLoader.h index c7dfdadefa..7d6a25b8cf 100644 --- a/Source/Core/DiscIO/BannerLoader.h +++ b/Source/Core/DiscIO/BannerLoader.h @@ -19,8 +19,8 @@ class IBannerLoader { public: IBannerLoader() - : m_pBannerFile(nullptr) - , m_IsValid(false) + : m_IsValid(false) + , m_pBannerFile(nullptr) {} virtual ~IBannerLoader() |