From 448cf66846ac2f97c9a76d172fc848c73992563a Mon Sep 17 00:00:00 2001 From: SirLynix Date: Tue, 2 Jan 2024 11:50:04 +0100 Subject: [PATCH] Minor fixes --- src/Nazara/Core/Win32/ThreadImpl.cpp | 6 ++---- src/Nazara/Utility/Skeleton.cpp | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/Nazara/Core/Win32/ThreadImpl.cpp b/src/Nazara/Core/Win32/ThreadImpl.cpp index 9a8abe64f..4d263f61e 100644 --- a/src/Nazara/Core/Win32/ThreadImpl.cpp +++ b/src/Nazara/Core/Win32/ThreadImpl.cpp @@ -3,6 +3,7 @@ // For conditions of distribution and use, see copyright notice in Config.hpp #include +#include #include #include #include @@ -57,7 +58,7 @@ namespace Nz::PlatformImpl HRESULT hr = GetThreadDescription(threadHandle, &namePtr); if (FAILED(hr)) - return ""; + return Format("", HRESULT_CODE(hr)); CallOnExit freeName([&] { LocalFree(namePtr); }); @@ -121,9 +122,6 @@ namespace Nz::PlatformImpl #if NAZARAUTILS_WINDOWS_NT6 else RaiseThreadNameException(::GetThreadId(threadHandle), threadName); -#else - NazaraUnused(threadHandle); - NazaraUnused(threadName); #endif #else diff --git a/src/Nazara/Utility/Skeleton.cpp b/src/Nazara/Utility/Skeleton.cpp index 83f698688..8fb92be48 100644 --- a/src/Nazara/Utility/Skeleton.cpp +++ b/src/Nazara/Utility/Skeleton.cpp @@ -260,7 +260,7 @@ namespace Nz const std::string& name = m_impl->joints[i].GetName(); if (!name.empty()) { - NazaraAssertFmt(!m_impl->jointMap.contains(name), "Joint name \{0}\" is already present in joint map", name); + NazaraAssertFmt(!m_impl->jointMap.contains(name), "joint name \"{0}\" is already present in joint map", name); m_impl->jointMap.emplace(name, i); } }