diff options
author | Peter Bell <peterbell10@live.co.uk> | 2020-07-06 21:01:36 +0200 |
---|---|---|
committer | Tiger Wang <ziwei.tiger@outlook.com> | 2020-07-06 21:53:04 +0200 |
commit | 829f8d46f0ae5d26441c6e960a1f3cdc618aea0e (patch) | |
tree | 133c93b61336735b3505cef52331d3ebc313d9c1 | |
parent | cWindow: Convert XYZ to Vector3 (#4764) (diff) | |
download | cuberite-829f8d46f0ae5d26441c6e960a1f3cdc618aea0e.tar cuberite-829f8d46f0ae5d26441c6e960a1f3cdc618aea0e.tar.gz cuberite-829f8d46f0ae5d26441c6e960a1f3cdc618aea0e.tar.bz2 cuberite-829f8d46f0ae5d26441c6e960a1f3cdc618aea0e.tar.lz cuberite-829f8d46f0ae5d26441c6e960a1f3cdc618aea0e.tar.xz cuberite-829f8d46f0ae5d26441c6e960a1f3cdc618aea0e.tar.zst cuberite-829f8d46f0ae5d26441c6e960a1f3cdc618aea0e.zip |
m--------- | lib/fmt | 0 | ||||
-rw-r--r-- | src/Logger.cpp | 2 | ||||
-rw-r--r-- | src/OSSupport/File.cpp | 2 | ||||
-rw-r--r-- | src/StringUtils.cpp | 4 | ||||
-rw-r--r-- | src/fmt.h | 5 |
5 files changed, 5 insertions, 8 deletions
diff --git a/lib/fmt b/lib/fmt -Subproject 9bdd1596cef1b57b9556f8bef32dc4a32322ef3 +Subproject 5173a76ba49936d252a85ee49b7eb96e3dff403 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; } @@ -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 <fmt/format.h> |