From f93c9277c62da934e3cb38255c03506b9fc58871 Mon Sep 17 00:00:00 2001 From: Konstantin Date: Sun, 22 Jan 2023 15:45:43 +0300 Subject: [PATCH] lib/filesystem: rename CreateFile to createFile In MinGW, there is a define which replaces all CreateFile to CreateFileA or CreateFileW and breaks compilation. Fix it. --- lib/filesystem/CFilesystemLoader.cpp | 2 +- lib/filesystem/FileStream.cpp | 2 +- lib/filesystem/FileStream.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/filesystem/CFilesystemLoader.cpp b/lib/filesystem/CFilesystemLoader.cpp index 36908a89d..51506d60b 100644 --- a/lib/filesystem/CFilesystemLoader.cpp +++ b/lib/filesystem/CFilesystemLoader.cpp @@ -88,7 +88,7 @@ bool CFilesystemLoader::createResource(std::string filename, bool update) if (!update) { - if (!FileStream::CreateFile(baseDirectory / filename)) + if (!FileStream::createFile(baseDirectory / filename)) return false; } fileList[resID] = filename; diff --git a/lib/filesystem/FileStream.cpp b/lib/filesystem/FileStream.cpp index a85fcc913..8dfb1f3a7 100644 --- a/lib/filesystem/FileStream.cpp +++ b/lib/filesystem/FileStream.cpp @@ -236,7 +236,7 @@ zlib_filefunc64_def* FileStream::GetMinizipFilefunc() } /*static*/ -bool FileStream::CreateFile(const boost::filesystem::path& filename) +bool FileStream::createFile(const boost::filesystem::path& filename) { FILE* f = do_open(filename.c_str(), CHAR_LITERAL("wb")); bool result = (f != nullptr); diff --git a/lib/filesystem/FileStream.h b/lib/filesystem/FileStream.h index edad65a38..52ed96f60 100644 --- a/lib/filesystem/FileStream.h +++ b/lib/filesystem/FileStream.h @@ -59,7 +59,7 @@ public: explicit FileStream(const boost::filesystem::path& p, std::ios_base::openmode mode = std::ios_base::in | std::ios_base::out) : boost::iostreams::stream(p, mode) {} - static bool CreateFile(const boost::filesystem::path& filename); + static bool createFile(const boost::filesystem::path& filename); static zlib_filefunc64_def* GetMinizipFilefunc(); };