From 92d556524bfacfad84fc3e5c7247d1d25506493c Mon Sep 17 00:00:00 2001 From: Peter Tissen Date: Mon, 28 Apr 2014 21:18:11 +0200 Subject: [PATCH 1/3] well let's hope Clang doesn't mind implicit unsigned int to u64 --- rpcs3/Gui/InterpreterDisAsm.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rpcs3/Gui/InterpreterDisAsm.cpp b/rpcs3/Gui/InterpreterDisAsm.cpp index 6dffef62cf..c208d303ce 100644 --- a/rpcs3/Gui/InterpreterDisAsm.cpp +++ b/rpcs3/Gui/InterpreterDisAsm.cpp @@ -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); From baaa2ae45a8adea199cba9bd8f20ecf4e3aec64c Mon Sep 17 00:00:00 2001 From: Peter Tissen Date: Mon, 28 Apr 2014 21:36:31 +0200 Subject: [PATCH 2/3] format warning disable for clang, it clutters up the build messages too much --- Utilities/StrFmt.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Utilities/StrFmt.h b/Utilities/StrFmt.h index a812ccaa74..430e65a8d0 100644 --- a/Utilities/StrFmt.h +++ b/Utilities/StrFmt.h @@ -84,7 +84,10 @@ namespace fmt{ for (;;) { std::vector buffptr(length); +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-wFormat-security" int printlen = snprintf(buffptr.data(), length, fmt.c_str(), std::forward(parameters)...); +#pragma clang diagnostic pop if (printlen >= 0 && printlen < length) { str = string(buffptr.data(), printlen); From 3220e9bbc4643a104e275470369b13608baa4aa6 Mon Sep 17 00:00:00 2001 From: Peter Tissen Date: Mon, 28 Apr 2014 21:50:07 +0200 Subject: [PATCH 3/3] format warning disable for clang, typo correction --- Utilities/StrFmt.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Utilities/StrFmt.h b/Utilities/StrFmt.h index 430e65a8d0..d4e46917eb 100644 --- a/Utilities/StrFmt.h +++ b/Utilities/StrFmt.h @@ -85,7 +85,7 @@ namespace fmt{ { std::vector buffptr(length); #pragma clang diagnostic push -#pragma clang diagnostic ignored "-wFormat-security" +#pragma clang diagnostic ignored "-Wformat-security" int printlen = snprintf(buffptr.data(), length, fmt.c_str(), std::forward(parameters)...); #pragma clang diagnostic pop if (printlen >= 0 && printlen < length)