Removed more compiler warnings in linux.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5170 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Glenn Rice
2010-03-07 22:48:37 +00:00
parent ff7da32c6b
commit beba3b7f5b
22 changed files with 33 additions and 35 deletions

View File

@ -34,7 +34,7 @@
using namespace Gen;
static int temp32;
//static int temp32; // unused?
//TODO - make an option
//#if _DEBUG
@ -43,7 +43,7 @@ static bool enableDebug = false;
// bool enableDebug = false;
//#endif
static bool enableStatistics = false;
//static bool enableStatistics = false; //unused?
//GLOBAL STATIC ALLOCATIONS x86
//EAX - ubiquitous scratch register - EVERYBODY scratches this

View File

@ -36,14 +36,16 @@
const u8 GC_ALIGNED16(pbswapShuffle2x4[16]) = {3, 2, 1, 0, 7, 6, 5, 4, 8, 9, 10, 11, 12, 13, 14, 15};
static u64 GC_ALIGNED16(temp64);
//static u64 GC_ALIGNED16(temp64); // unused?
// TODO(ector): Improve 64-bit version
#if 0
static void WriteDual32(u64 value, u32 address)
{
Memory::Write_U32((u32)(value >> 32), address);
Memory::Write_U32((u32)value, address + 4);
}
#endif
// The big problem is likely instructions that set the quantizers in the same block.
// We will have to break block after quantizers are written to.
@ -66,12 +68,12 @@ void Jit64::psq_st(UGeckoInstruction inst)
int s = inst.RS; // Fp numbers
const UGQR gqr(rSPR(SPR_GQR0 + inst.I));
#if 0
u16 store_gqr = gqr.Hex & 0xFFFF;
const EQuantizeType stType = static_cast<EQuantizeType>(gqr.ST_TYPE);
int stScale = gqr.ST_SCALE;
#if 0
// Is this specialization still worth it? Let's keep it for now. It's probably
// not very risky since a game most likely wouldn't use the same code to process
// floats as integers (but you never know....).

View File

@ -35,7 +35,7 @@
using namespace Gen;
static int temp32;
//static int temp32; // unused?
//TODO - make an option
//#if _DEBUG
@ -44,7 +44,7 @@ static bool enableDebug = false;
// bool enableDebug = false;
//#endif
static bool enableStatistics = false;
//static bool enableStatistics = false; // unused?
//GLOBAL STATIC ALLOCATIONS x86
//EAX - ubiquitous scratch register - EVERYBODY scratches this

View File

@ -119,7 +119,7 @@ std::string CVolumeWAD::GetName() const
// Remove the null bytes due to 16bit char length
std::string out_temp;
for (int i = 0; i < sizeof(temp); i+=2)
for (unsigned int i = 0; i < sizeof(temp); i+=2)
{
// Replace null chars with a single space per null section
if (temp[i] == '\0' && i > 0)

View File

@ -50,8 +50,9 @@ END_EVENT_TABLE()
CLogWindow::CLogWindow(CFrame *parent, wxWindowID id, const wxString &, const wxPoint &position, const wxSize& size, long style)
: wxPanel(parent, id, position, size, style)
, Parent(parent), m_LogSection(1), m_Log(NULL), m_cmdline(NULL), m_FontChoice(NULL)
, m_LogAccess(true)
, Parent(parent) , m_LogAccess(true)
, m_Log(NULL), m_cmdline(NULL), m_FontChoice(NULL)
, m_LogSection(1)
, m_SJISConv(wxFONTENCODING_SHIFT_JIS)
{
m_LogManager = LogManager::GetInstance();

View File

@ -359,7 +359,7 @@ void CWiiSaveCrypted::ExportWiiSaveFiles()
if (__name.length() > 0x44)
{
PanicAlert("% is too long for the filename, max chars is 45", __name.c_str());
PanicAlert("%s is too long for the filename, max chars is 45", __name.c_str());
b_valid = false;
return;
}

View File

@ -367,7 +367,7 @@ void NetPlay::UpdateNetWindow(bool update_infos, wxString infos)
{
m_critical.Enter();
//m_Game_str->SetLabel(wxString::Format(wxT(" Game : %s"), m_selectedGame.c_str()));
m_Game_str->SetLabel(wxString::FromUTF8( ( wxT( "Game %s"), m_selectedGame.c_str() )));
m_Game_str->SetLabel(wxString::FromAscii(std::string("Game " + m_selectedGame).c_str()));
m_critical.Leave();
}
}

View File

@ -69,7 +69,7 @@ public:
private:
size_t CalculateHash() {
size_t h = -1;
for (int i = 0; i < sizeof(vid) / sizeof(vid[0]); ++i) {
for (unsigned int i = 0; i < sizeof(vid) / sizeof(vid[0]); ++i) {
h = h * 137 + vid[i];
}
return h;