From 330626ab22fe2e87afa5306c5f4039088c41b49e Mon Sep 17 00:00:00 2001 From: Tiger Wang Date: Mon, 4 May 2020 19:21:48 +0100 Subject: Update submodules --- src/OSSupport/File.cpp | 8 ++------ src/OSSupport/File.h | 6 +++--- 2 files changed, 5 insertions(+), 9 deletions(-) (limited to 'src/OSSupport') diff --git a/src/OSSupport/File.cpp b/src/OSSupport/File.cpp index 2d26c3cd6..f860c37ca 100644 --- a/src/OSSupport/File.cpp +++ b/src/OSSupport/File.cpp @@ -695,10 +695,10 @@ AString cFile::GetExecutableExt(void) -int cFile::vPrintf(const char * a_Fmt, fmt::printf_args a_ArgList) +int cFile::vPrintf(const char * a_Format, fmt::printf_args a_ArgList) { fmt::memory_buffer Buffer; - fmt::vprintf(Buffer, fmt::to_string_view(a_Fmt), a_ArgList); + fmt::vprintf(Buffer, fmt::to_string_view(a_Format), a_ArgList); return Write(Buffer.data(), Buffer.size()); } @@ -710,7 +710,3 @@ void cFile::Flush(void) { fflush(m_File); } - - - - diff --git a/src/OSSupport/File.h b/src/OSSupport/File.h index 689900816..9987c41c7 100644 --- a/src/OSSupport/File.h +++ b/src/OSSupport/File.h @@ -168,11 +168,11 @@ public: /** Returns the list of all items in the specified folder (files, folders, nix pipes, whatever's there). */ static AStringVector GetFolderContents(const AString & a_Folder); // Exported in ManualBindings.cpp - int vPrintf(const char * a_Fmt, fmt::printf_args); + int vPrintf(const char * a_Format, fmt::printf_args a_ArgList); template - int Printf(const char * a_Fmt, const Args & ... a_Args) + int Printf(const char * a_Format, const Args & ... a_Args) { - return vPrintf(a_Fmt, fmt::make_printf_args(a_Args...)); + return vPrintf(a_Format, fmt::make_printf_args(a_Args...)); } /** Flushes all the bufferef output into the file (only when writing) */ -- cgit v1.2.3