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

Merge pull request #213 from Bigpet/master 

Compile fix for VS (doesn't like implicit `u64 *` to `unsigned long*`)
This commit is contained in:
Alexandro Sánchez Bach 2014-04-28 23:15:52 +02:00
parent 90896560bb 3220e9bbc4
commit f908a3ca78
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Utilities/StrFmt.h
View File

@ -84,7 +84,10 @@ namespace fmt{
for (;;)
{
std::vector<char> buffptr(length);
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wformat-security"
int printlen = snprintf(buffptr.data(), length, fmt.c_str(), std::forward<Args>(parameters)...);
#pragma clang diagnostic pop
if (printlen >= 0 && printlen < length)
{
str = string(buffptr.data(), printlen);

2
rpcs3/Gui/InterpreterDisAsm.cpp
View File

@ -455,7 +455,7 @@ void InterpreterDisAsmFrame::Show_Val(wxCommandEvent& WXUNUSED(event))
if(diag->ShowModal() == wxID_OK)
{
u64 pc = CPU ? CPU->PC : 0x0;
unsigned long pc = CPU ? CPU->PC : 0x0;
p_pc->GetValue().ToULong(&pc, 16);
Emu.GetMarkedPoints().push_back(pc);
remove_markedPC.push_back(Emu.GetMarkedPoints().size()-1);