AuroraSupport/AuroraRuntime
2
1
Fork 0
Code Issues 27 Pull Requests Releases Wiki Activity

[+] AuTryInsert for maps

Browse Source 
[*] Fix Aurora::IO::FS Remove not removing empty directories
This commit is contained in:
Reece Wilson 2022-02-20 21:52:39 +00:00
parent d67d6b38db
commit 3f4cf93877
3 changed files with 31 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Include/auROXTL/auContainerUtils.hpp
View File

@ -285,6 +285,30 @@ static auline bool AuTryRemoveByTupleN(List &list, const Key &key)
return false;
}
#include <auROXTL/auTupleUtils.hpp>
template<typename Container, typename Key_t, typename Type_t>
static auline bool AuTryInsert(Container &container, const Key_t &key, Type_t &&value)
{
try
{
auto itr = container.find(key);
if (itr == container.end())
{
container.insert(AuMakePair(key, value));
}
else
{
itr->second = value;
}
return true;
}
catch (...)
{
return false;
}
}
template<typename Container, typename Type>
static auline bool AuTryInsert(Container &container, const Type &value)
{

6
Source/IO/FS/FS.NT.cpp
View File

@ -211,7 +211,11 @@ namespace Aurora::IO::FS
{
try
{
return DeleteFileW(Locale::ConvertFromUTF8(NormalizePathRet(path)).c_str());
auto translatedPath = Locale::ConvertFromUTF8(NormalizePathRet(path));
if (!DeleteFileW(translatedPath.c_str()))
{
return RemoveDirectoryW(translatedPath.c_str());
}
}
catch (...)
{

4
Source/Threading/Threads/ThreadHandles.cpp
View File

@ -52,9 +52,9 @@ namespace Aurora::Threading::Threads
{
AU_LOCK_GUARD(gMutex);
#if defined(AURORA_IS_POSIX_DERIVED)
AuTryInsert(gUnixHandlesToThreads, AuMakePair(id.unixThreadId, handle));
AuTryInsert(gUnixHandlesToThreads, id.unixThreadId, handle);
#endif
AuTryInsert(gNativeHandlesToThreads, AuMakePair(id.threadId, handle));
AuTryInsert(gNativeHandlesToThreads, id.threadId, handle);
}
static void ReleaseThisThread(BasicThreadId id)