ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #813 from ChuckRozhon/min_warning 

Removed warning caused by calling std::min<int> with size_t values
This commit is contained in:
Lioncash 2014-08-15 14:43:43 -04:00
parent d5d5580424 3baea48bba
commit 5339c52fe0
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/Core/DSP/DSPCodeUtil.cpp
View File

@ -60,7 +60,7 @@ bool Compare(const std::vector<u16> &code1, const std::vector<u16> &code2)
if (code1.size() != code2.size())
printf("Size difference! 1=%i 2=%i\n", (int)code1.size(), (int)code2.size());
u32 count_equal = 0;
const int min_size = std::min<int>(code1.size(), code2.size());
const int min_size = std::min<int>((int)code1.size(), (int)code2.size());
AssemblerSettings settings;
DSPDisassembler disassembler(settings);