From abc848b88c8555494e7570804a6d1d43e3cd3a73 Mon Sep 17 00:00:00 2001 From: Shawn Hoffman Date: Tue, 10 May 2022 16:11:54 -0700 Subject: msvc: bump min version to vs 17.2 --- Source/PCH/pch.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Source') diff --git a/Source/PCH/pch.h b/Source/PCH/pch.h index 7996c611d4..10efeec5e0 100644 --- a/Source/PCH/pch.h +++ b/Source/PCH/pch.h @@ -6,7 +6,7 @@ #define STRINGIFY_HELPER(x) #x #define STRINGIFY(x) STRINGIFY_HELPER(x) -#if defined _MSC_FULL_VER && _MSC_FULL_VER < 193030705 +#if defined _MSC_FULL_VER && _MSC_FULL_VER < 193231328 #pragma message("Current _MSC_FULL_VER: " STRINGIFY(_MSC_FULL_VER)) #error Please update your build environment to the latest Visual Studio 2022! #endif -- cgit v1.2.3 From 56626f73bf1f5d160aff866f6dd51cd1f3dad87f Mon Sep 17 00:00:00 2001 From: Shawn Hoffman Date: Tue, 10 May 2022 16:38:21 -0700 Subject: fmt: fix 'ambigous overload' error --- Source/Core/VideoCommon/BPMemory.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'Source') diff --git a/Source/Core/VideoCommon/BPMemory.h b/Source/Core/VideoCommon/BPMemory.h index 4729e06be5..28155a2cd6 100644 --- a/Source/Core/VideoCommon/BPMemory.h +++ b/Source/Core/VideoCommon/BPMemory.h @@ -1231,10 +1231,10 @@ struct fmt::formatter template auto format(const ScissorPos& pos, FormatContext& ctx) { - return format_to(ctx.out(), - "X: {} (raw: {})\n" - "Y: {} (raw: {})", - pos.x - 342, pos.x_full, pos.y - 342, pos.y_full); + return fmt::format_to(ctx.out(), + "X: {} (raw: {})\n" + "Y: {} (raw: {})", + pos.x - 342, pos.x_full, pos.y - 342, pos.y_full); } }; @@ -1257,10 +1257,10 @@ struct fmt::formatter template auto format(const ScissorOffset& off, FormatContext& ctx) { - return format_to(ctx.out(), - "X: {} (raw: {})\n" - "Y: {} (raw: {})", - (off.x << 1) - 342, off.x_full, (off.y << 1) - 342, off.y_full); + return fmt::format_to(ctx.out(), + "X: {} (raw: {})\n" + "Y: {} (raw: {})", + (off.x << 1) - 342, off.x_full, (off.y << 1) - 342, off.y_full); } }; -- cgit v1.2.3 From fa17153ebc83cbc0ae7a1d7430d9509db0c6e0d6 Mon Sep 17 00:00:00 2001 From: Shawn Hoffman Date: Tue, 10 May 2022 16:39:12 -0700 Subject: fmt: use make_format_args instead of make_args_checked make_args_checked is deprecated see https://github.com/fmtlib/fmt/pull/2760 and the linked comment --- Source/Core/Common/Logging/Log.h | 3 +-- Source/Core/Common/MsgHandler.h | 9 ++------- 2 files changed, 3 insertions(+), 9 deletions(-) (limited to 'Source') diff --git a/Source/Core/Common/Logging/Log.h b/Source/Core/Common/Logging/Log.h index 092a9b4dc6..98d420bda2 100644 --- a/Source/Core/Common/Logging/Log.h +++ b/Source/Core/Common/Logging/Log.h @@ -94,8 +94,7 @@ void GenericLogFmt(LogLevel level, LogType type, const char* file, int line, con static_assert(NumFields == sizeof...(args), "Unexpected number of replacement fields in format string; did you pass too few or " "too many arguments?"); - GenericLogFmtImpl(level, type, file, line, format, - fmt::make_args_checked(format, args...)); + GenericLogFmtImpl(level, type, file, line, format, fmt::make_format_args(args...)); } void GenericLog(LogLevel level, LogType type, const char* file, int line, const char* fmt, ...) diff --git a/Source/Core/Common/MsgHandler.h b/Source/Core/Common/MsgHandler.h index 0e2de793a1..750da515b0 100644 --- a/Source/Core/Common/MsgHandler.h +++ b/Source/Core/Common/MsgHandler.h @@ -43,7 +43,7 @@ bool MsgAlertFmt(bool yes_no, MsgType style, Common::Log::LogType log_type, cons "too many arguments?"); static_assert(fmt::is_compile_string::value); return MsgAlertFmtImpl(yes_no, style, log_type, file, line, format, - fmt::make_args_checked(format, args...)); + fmt::make_format_args(args...)); } template @@ -57,12 +57,7 @@ bool MsgAlertFmtT(bool yes_no, MsgType style, Common::Log::LogType log_type, con "Unexpected number of replacement fields in format string; did you pass too few or " "too many arguments?"); static_assert(fmt::is_compile_string::value); - // It's only possible for us to compile-time check the English-language string. - // make_args_checked uses static_asserts to verify that a string is formattable with the given - // arguments. But it can't do that if the string varies at runtime, so we can't check - // translations. Still, verifying that the English string is correct will help ensure that - // translations use valid strings. - auto arg_list = fmt::make_args_checked(format, args...); + auto arg_list = fmt::make_format_args(args...); return MsgAlertFmtImpl(yes_no, style, log_type, file, line, translated_format, arg_list); } -- cgit v1.2.3 From 7b8e6c5b3643bb3ec09de3be5598d5e35caa3986 Mon Sep 17 00:00:00 2001 From: Shawn Hoffman Date: Tue, 10 May 2022 21:17:10 -0700 Subject: fmt: do not define uint type in global namespace --- Source/Core/DolphinQt/DolphinQt.vcxproj | 2 -- 1 file changed, 2 deletions(-) (limited to 'Source') diff --git a/Source/Core/DolphinQt/DolphinQt.vcxproj b/Source/Core/DolphinQt/DolphinQt.vcxproj index da9e6096b0..4991ec9e54 100644 --- a/Source/Core/DolphinQt/DolphinQt.vcxproj +++ b/Source/Core/DolphinQt/DolphinQt.vcxproj @@ -30,8 +30,6 @@ $(ProjectDir)Settings;%(AdditionalIncludeDirectories) $(ProjectDir)TAS;%(AdditionalIncludeDirectories) $(ProjectDir)VideoInterface;%(AdditionalIncludeDirectories) - - false DolphinQt.manifest;%(AdditionalManifestFiles) -- cgit v1.2.3