mewin/mijin2
1
0
Fork 0
Code Issues 2 Pull Requests Projects Releases Wiki Activity

Fixed test and CLang compilation.

Browse Source
This commit is contained in:
Patrick 2025-05-20 21:15:51 +02:00
parent 45623e5273
commit 17bd408d3c
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/mijin/virtual_filesystem/memory.cpp
View File

@ -139,7 +139,7 @@ detail::MemoryFolder* MemoryFileSystemAdapter::findFolder(const fs::path& path,
return folder; 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 { return {
.path = path, .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 { return {
.path = path, .path = path,

4
source/mijin/virtual_filesystem/stacked.cpp
View File

@ -39,14 +39,14 @@ fs::path StackedFileSystemAdapter::getHomeFolder()
#if MIJIN_COMPILER == MIJIN_COMPILER_MSVC #if MIJIN_COMPILER == MIJIN_COMPILER_MSVC
#pragma warning(push) #pragma warning(push)
#pragma warning(disable : 4996) // yeah, we're using a deprecated function here, in order to implement another deprecated function ¯\_(ツ)_/¯ #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 push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations" #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#endif #endif
return adapters_.front()->getHomeFolder(); return adapters_.front()->getHomeFolder();
#if MIJIN_COMPILER == MIJIN_COMPILER_MSVC #if MIJIN_COMPILER == MIJIN_COMPILER_MSVC
#pragma warning(pop) #pragma warning(pop)
#elif MIJIN_COMPILER == MIJIN_COMPILER_GCC #elif MIJIN_COMPILER == MIJIN_COMPILER_GCC || MIJIN_COMPILER == MIJIN_COMPILER_CLANG
#pragma GCC diagnostic pop #pragma GCC diagnostic pop
#endif #endif
} }