From 3baea48bbab32ebc628acb5a51afa5c7266ed3f9 Mon Sep 17 00:00:00 2001 From: Charles Rozhon Date: Fri, 15 Aug 2014 13:23:19 -0500 Subject: [PATCH] Removed warning caused by calling std::min with size_t values --- Source/Core/Core/DSP/DSPCodeUtil.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Core/Core/DSP/DSPCodeUtil.cpp b/Source/Core/Core/DSP/DSPCodeUtil.cpp index 977e9bd0ba..b3b830259b 100644 --- a/Source/Core/Core/DSP/DSPCodeUtil.cpp +++ b/Source/Core/Core/DSP/DSPCodeUtil.cpp @@ -60,7 +60,7 @@ bool Compare(const std::vector &code1, const std::vector &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(code1.size(), code2.size()); + const int min_size = std::min((int)code1.size(), (int)code2.size()); AssemblerSettings settings; DSPDisassembler disassembler(settings);