mirrors/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-02-01 02:21:26 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

A few more warnings.

Browse Source
This commit is contained in:
comex 2013-09-01 23:25:57 -04:00
parent 2630169229
commit 35b8dfbe0c
7 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/Common/Src/ArmEmitter.cpp
View File

@ -86,6 +86,7 @@ bool TryMakeOperand2_AllowNegation(s32 imm, Operand2 &op2, bool *negated)
Operand2 AssumeMakeOperand2(u32 imm) { Operand2 AssumeMakeOperand2(u32 imm) {
Operand2 op2; Operand2 op2;
bool result = TryMakeOperand2(imm, op2); bool result = TryMakeOperand2(imm, op2);
(void) result;
_dbg_assert_msg_(DYNA_REC, result, "Could not make assumed Operand2."); _dbg_assert_msg_(DYNA_REC, result, "Could not make assumed Operand2.");
return op2; return op2;
} }
@ -958,7 +959,7 @@ extern const VFPEnc VFPOps[16][2] = {
{{ -1, -1}, {0x3B, 0x30}}, // 14: VABSi {{ -1, -1}, {0x3B, 0x30}}, // 14: VABSi
}; };
extern const char *VFPOpNames[16] = { const char *VFPOpNames[16] = {
"VMLA", "VMLA",
"VNMLA", "VNMLA",
"VMLS", "VMLS",
@ -1189,6 +1190,7 @@ void ARMXEmitter::VMOV(ARMReg Dest, ARMReg Src)
} }
// Moving NEON registers // Moving NEON registers
int SrcSize = Src < D0 ? 1 : Src < Q0 ? 2 : 4; int SrcSize = Src < D0 ? 1 : Src < Q0 ? 2 : 4;
(void) SrcSize;
int DestSize = Dest < D0 ? 1 : Dest < Q0 ? 2 : 4; int DestSize = Dest < D0 ? 1 : Dest < Q0 ? 2 : 4;
bool Single = DestSize == 1; bool Single = DestSize == 1;
bool Quad = DestSize == 4; bool Quad = DestSize == 4;

2
Source/Core/Common/Src/StringUtil.cpp
View File

@ -270,7 +270,7 @@ std::string ReplaceAll(std::string result, const std::string& src, const std::st
while(1) while(1)
{ {
size_t pos = result.find(src); size_t pos = result.find(src);
if (pos == -1) break; if (pos == std::string::npos) break;
result.replace(pos, src.size(), dest); result.replace(pos, src.size(), dest);
} }
return result; return result;

2
Source/Core/Core/Src/ec_wii.cpp
View File

@ -153,7 +153,7 @@ EcWii::EcWii()
} }
else else
{ {
ERROR_LOG(WII_IPC_ES, "Failed to read keys.bin, check it is the correct size of %08lX bytes.", sizeof(BootMiiKeysBin)); ERROR_LOG(WII_IPC_ES, "Failed to read keys.bin, check it is the correct size of %08X bytes.", (unsigned int) sizeof(BootMiiKeysBin));
} }
} }
else else

2
Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.cpp
View File

@ -62,7 +62,7 @@ void CWiiSaveCrypted::ExportAllSaves()
} }
} }
} }
SuccessAlertT("Found %llx save files", titles.size()); SuccessAlertT("Found %x save files", (unsigned int) titles.size());
for (u32 i = 0; i < titles.size(); ++i) for (u32 i = 0; i < titles.size(); ++i)
{ {
CWiiSaveCrypted* exportSave = new CWiiSaveCrypted("", titles[i]); CWiiSaveCrypted* exportSave = new CWiiSaveCrypted("", titles[i]);

3
Source/Core/DolphinWX/Src/MemoryCards/WiiSaveCrypted.h
View File

@ -42,8 +42,7 @@ private:
std::string encryptedSavePath; std::string encryptedSavePath;
std::string BannerFilePath, std::string WiiTitlePath;
WiiTitlePath;
u8 IV[0x10]; u8 IV[0x10];

6
Source/Core/VideoCommon/Src/x64TextureDecoder.cpp
View File

@ -28,6 +28,12 @@
#include <tmmintrin.h> #include <tmmintrin.h>
#endif #endif
// This avoids a harmless warning from a system header in Clang;
// see http://llvm.org/bugs/show_bug.cgi?id=16093
#ifdef __clang__
#pragma clang diagnostic ignored "-Wshadow"
#endif
bool TexFmt_Overlay_Enable=false; bool TexFmt_Overlay_Enable=false;
bool TexFmt_Overlay_Center=false; bool TexFmt_Overlay_Center=false;

4
Source/Plugins/Plugin_VideoOGL/Src/GLUtil.h
View File

@ -30,8 +30,8 @@
#define GL_READ_WRITE 0x88BA #define GL_READ_WRITE 0x88BA
#define GL_SRC1_ALPHA 0 #define GL_SRC1_ALPHA 0
#define GL_BGRA GL_RGBA #define GL_BGRA GL_RGBA
#define glDrawElementsBaseVertex #define glDrawElementsBaseVertex(...)
#define glDrawRangeElementsBaseVertex #define glDrawRangeElementsBaseVertex(...)
#endif #endif
#else #else
#define TEX2D GL_TEXTURE_RECTANGLE_ARB #define TEX2D GL_TEXTURE_RECTANGLE_ARB