From 17bd408d3c78d4eb2ea2ef69f84873c50a2c1ca8 Mon Sep 17 00:00:00 2001 From: Patrick Wuttke Date: Tue, 20 May 2025 21:15:51 +0200 Subject: [PATCH] Fixed test and CLang compilation. --- source/mijin/virtual_filesystem/memory.cpp | 4 ++-- source/mijin/virtual_filesystem/stacked.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/source/mijin/virtual_filesystem/memory.cpp b/source/mijin/virtual_filesystem/memory.cpp index 45d27e2..8e1c6fd 100644 --- a/source/mijin/virtual_filesystem/memory.cpp +++ b/source/mijin/virtual_filesystem/memory.cpp @@ -139,7 +139,7 @@ detail::MemoryFolder* MemoryFileSystemAdapter::findFolder(const fs::path& path, return folder; } -FileInfo MemoryFileSystemAdapter::folderInfo(const fs::path& path, const detail::MemoryFolder& folder) const noexcept +FileInfo MemoryFileSystemAdapter::folderInfo(const fs::path& path, const detail::MemoryFolder& folder) const MIJIN_NOEXCEPT { return { .path = path, @@ -149,7 +149,7 @@ FileInfo MemoryFileSystemAdapter::folderInfo(const fs::path& path, const detail: }; } -FileInfo MemoryFileSystemAdapter::fileInfo(const fs::path& path, const detail::MemoryFile& file) const noexcept +FileInfo MemoryFileSystemAdapter::fileInfo(const fs::path& path, const detail::MemoryFile& file) const MIJIN_NOEXCEPT { return { .path = path, diff --git a/source/mijin/virtual_filesystem/stacked.cpp b/source/mijin/virtual_filesystem/stacked.cpp index 9f97729..89a33c1 100644 --- a/source/mijin/virtual_filesystem/stacked.cpp +++ b/source/mijin/virtual_filesystem/stacked.cpp @@ -39,14 +39,14 @@ fs::path StackedFileSystemAdapter::getHomeFolder() #if MIJIN_COMPILER == MIJIN_COMPILER_MSVC #pragma warning(push) #pragma warning(disable : 4996) // yeah, we're using a deprecated function here, in order to implement another deprecated function ¯\_(ツ)_/¯ -#elif MIJIN_COMPILER == MIJIN_COMPILER_GCC +#elif MIJIN_COMPILER == MIJIN_COMPILER_GCC || MIJIN_COMPILER == MIJIN_COMPILER_CLANG #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wdeprecated-declarations" #endif return adapters_.front()->getHomeFolder(); #if MIJIN_COMPILER == MIJIN_COMPILER_MSVC #pragma warning(pop) -#elif MIJIN_COMPILER == MIJIN_COMPILER_GCC +#elif MIJIN_COMPILER == MIJIN_COMPILER_GCC || MIJIN_COMPILER == MIJIN_COMPILER_CLANG #pragma GCC diagnostic pop #endif }