From 829f8d46f0ae5d26441c6e960a1f3cdc618aea0e Mon Sep 17 00:00:00 2001 From: Peter Bell Date: Mon, 6 Jul 2020 20:01:36 +0100 Subject: [PATCH] Update fmtlib to 7.0.0 --- lib/fmt | 2 +- src/Logger.cpp | 2 +- src/OSSupport/File.cpp | 2 +- src/StringUtils.cpp | 4 ++-- src/fmt.h | 5 +---- 5 files changed, 6 insertions(+), 9 deletions(-) diff --git a/lib/fmt b/lib/fmt index 9bdd1596c..5173a76ba 160000 --- a/lib/fmt +++ b/lib/fmt @@ -1 +1 @@ -Subproject commit 9bdd1596cef1b57b9556f8bef32dc4a32322ef3e +Subproject commit 5173a76ba49936d252a85ee49b7eb96e3dff4033 diff --git a/src/Logger.cpp b/src/Logger.cpp index 05039cb1b..eac240790 100644 --- a/src/Logger.cpp +++ b/src/Logger.cpp @@ -90,7 +90,7 @@ void cLogger::LogPrintf( { fmt::memory_buffer Buffer; WriteLogOpener(Buffer); - fmt::printf(Buffer, fmt::to_string_view(a_Format), a_ArgList); + fmt::vprintf(Buffer, fmt::to_string_view(a_Format), a_ArgList); fmt::format_to(Buffer, "\n"); LogLine(std::string_view(Buffer.data(), Buffer.size()), a_LogLevel); diff --git a/src/OSSupport/File.cpp b/src/OSSupport/File.cpp index 109c51eb7..fc3ddbdeb 100644 --- a/src/OSSupport/File.cpp +++ b/src/OSSupport/File.cpp @@ -695,7 +695,7 @@ AString cFile::GetExecutableExt(void) int cFile::vPrintf(const char * a_Fmt, fmt::printf_args a_ArgList) { fmt::memory_buffer Buffer; - fmt::printf(Buffer, fmt::to_string_view(a_Fmt), a_ArgList); + fmt::vprintf(Buffer, fmt::to_string_view(a_Fmt), a_ArgList); return Write(Buffer.data(), Buffer.size()); } diff --git a/src/StringUtils.cpp b/src/StringUtils.cpp index f1f0314f1..fc19decb3 100644 --- a/src/StringUtils.cpp +++ b/src/StringUtils.cpp @@ -56,7 +56,7 @@ AString & vPrintf(AString & str, const char * format, fmt::printf_args args) { ASSERT(format != nullptr); fmt::memory_buffer Buffer; - fmt::printf(Buffer, fmt::to_string_view(format), args); + fmt::vprintf(Buffer, fmt::to_string_view(format), args); str.assign(Buffer.data(), Buffer.size()); return str; } @@ -79,7 +79,7 @@ AString & vAppendPrintf(AString & a_String, const char * format, fmt::printf_arg { ASSERT(format != nullptr); fmt::memory_buffer Buffer; - fmt::printf(Buffer, fmt::to_string_view(format), args); + fmt::vprintf(Buffer, fmt::to_string_view(format), args); a_String.append(Buffer.data(), Buffer.size()); return a_String; } diff --git a/src/fmt.h b/src/fmt.h index 0fe69845a..5ed521c18 100644 --- a/src/fmt.h +++ b/src/fmt.h @@ -2,11 +2,8 @@ #ifdef __clang__ #pragma clang diagnostic push - #pragma clang diagnostic ignored "-Wunknown-pragmas" - #pragma clang diagnostic ignored "-Wunknown-warning-option" + #pragma clang diagnostic ignored "-Wsign-conversion" #pragma clang diagnostic ignored "-Wsigned-enum-bitfield" - #pragma clang diagnostic ignored "-Wundefined-func-template" - #pragma clang diagnostic ignored "-Wc++2a-compat" #endif #include