piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-21 13:20:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix some of the compiler warnings that have appeared recently.

Browse Source
This commit is contained in:
Glenn Rice
2013-05-05 23:22:57 -05:00
parent 46cd91dc0d
commit 12d791a628
4 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Source/Core/Core/Src/State.cpp
View File

@ -157,7 +157,7 @@ void VerifyBuffer(std::vector<u8>& buffer)
// return state number not in map
int GetEmptySlot(std::map<double, int> m)
{
for (int i = 1; i <= NUM_STATES; i++)
for (int i = 1; i <= (int)NUM_STATES; i++)
{
bool found = false;
for (std::map<double, int>::iterator it = m.begin(); it != m.end(); it++)
@ -173,12 +173,14 @@ int GetEmptySlot(std::map<double, int> m)
return -1;
}
static std::string MakeStateFilename(int number);
// read state timestamps
std::map<double, int> GetSavedStates()
{
StateHeader header;
std::map<double, int> m;
for (int i = 1; i <= NUM_STATES; i++)
for (int i = 1; i <= (int)NUM_STATES; i++)
{
if (File::Exists(MakeStateFilename(i)))
{
@ -570,7 +572,7 @@ void LoadLastSaved(int i)
{
std::map<double, int> savedStates = GetSavedStates();
if (i > savedStates.size())
if (i > (int)savedStates.size())
Core::DisplayMessage("State doesn't exist", 2000);
else
{