diff --git a/Common/Vulkan/VulkanContext.cpp b/Common/Vulkan/VulkanContext.cpp index a949a836fd..fb92fb5791 100644 --- a/Common/Vulkan/VulkanContext.cpp +++ b/Common/Vulkan/VulkanContext.cpp @@ -27,8 +27,6 @@ #define new DBG_NEW #endif -using namespace std; - static const char *validationLayers[] = { "VK_LAYER_LUNARG_standard_validation", /* diff --git a/Core/MIPS/x86/CompReplace.cpp b/Core/MIPS/x86/CompReplace.cpp index 336a38264e..b6ac76a439 100644 --- a/Core/MIPS/x86/CompReplace.cpp +++ b/Core/MIPS/x86/CompReplace.cpp @@ -27,7 +27,7 @@ using namespace Gen; int Jit::Replace_fabsf() { fpr.SpillLock(0, 12); - fpr.MapReg(0, MAP_DIRTY | MAP_NOINIT); + fpr.MapReg(0, false, true); MOVSS(fpr.RX(0), fpr.R(12)); ANDPS(fpr.RX(0), M(&ssNoSignMask)); fpr.ReleaseSpillLocks(); diff --git a/UI/DisplayLayoutScreen.cpp b/UI/DisplayLayoutScreen.cpp index 0447aaeacf..0154567b9d 100644 --- a/UI/DisplayLayoutScreen.cpp +++ b/UI/DisplayLayoutScreen.cpp @@ -31,7 +31,7 @@ #include "GPU/GLES/Framebuffer.h" static const int leftColumnWidth = 200; -static const float orgRatio = 1.764706; +static const float orgRatio = 1.764706f; // Ugly hackery, need to rework some stuff to get around this static float local_dp_xres; diff --git a/UI/GameSettingsScreen.cpp b/UI/GameSettingsScreen.cpp index 32c4a1f93b..6a5c49415d 100644 --- a/UI/GameSettingsScreen.cpp +++ b/UI/GameSettingsScreen.cpp @@ -58,7 +58,6 @@ #include "util/text/utf8.h" #include "Windows/W32Util/ShellUtil.h" #include "Windows/W32Util/Misc.h" -using namespace std; #endif @@ -729,7 +728,7 @@ UI::EventReturn GameSettingsScreen::OnSavePathMydoc(UI::EventParams &e) { g_Config.memStickDirectory = PPSSPPpath + "memstick/"; } else { - ofstream myfile; + std::ofstream myfile; myfile.open(PPSSPPpath + "installed.txt"); if (myfile.is_open()){ myfile.close(); diff --git a/ext/native/base/basictypes.h b/ext/native/base/basictypes.h index c7cb845a99..f095ffe43c 100644 --- a/ext/native/base/basictypes.h +++ b/ext/native/base/basictypes.h @@ -6,7 +6,6 @@ #ifdef _WIN32 #pragma warning(disable:4244) #pragma warning(disable:4996) -#pragma warning(disable:4305) // truncation from double to float #endif #define DISALLOW_COPY_AND_ASSIGN(t) \ diff --git a/unittest/UnitTest.cpp b/unittest/UnitTest.cpp index f1716ab2bd..715525a672 100644 --- a/unittest/UnitTest.cpp +++ b/unittest/UnitTest.cpp @@ -202,7 +202,7 @@ void fcs2(float theta, float &outsine, float &outcosine) { float x = 2 * gamma - gamma * fabs(gamma); float y = 2 * theta - theta * fabs(theta); - const float P = 0.225; + const float P = 0.225f; outsine = P * (y * fabsf(y) - y) + y; // Q * y + P * y * abs(y) outcosine = P * (x * fabsf(x) - x) + x; // Q * y + P * y * abs(y) }