From 2d3d7a670f4818c44280f2cf275ccf2b78a6b9e6 Mon Sep 17 00:00:00 2001 From: SirLynix Date: Thu, 25 Jan 2024 17:36:44 +0100 Subject: [PATCH] Update to latest NazaraUtils version --- src/Nazara/Core/Posix/ProcessImpl.cpp | 2 +- src/Nazara/Utility/GuillotineImageAtlas.cpp | 4 +--- xmake.lua | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/Nazara/Core/Posix/ProcessImpl.cpp b/src/Nazara/Core/Posix/ProcessImpl.cpp index a10c036ee..bc82fbfe9 100644 --- a/src/Nazara/Core/Posix/ProcessImpl.cpp +++ b/src/Nazara/Core/Posix/ProcessImpl.cpp @@ -107,7 +107,7 @@ namespace Nz::PlatformImpl std::exit(1); } - __builtin_unreachable(); // TODO: NAZARA_UNREACHABLE() + NAZARA_UNREACHABLE(); } else { diff --git a/src/Nazara/Utility/GuillotineImageAtlas.cpp b/src/Nazara/Utility/GuillotineImageAtlas.cpp index 875501e0d..e67ef6f0d 100644 --- a/src/Nazara/Utility/GuillotineImageAtlas.cpp +++ b/src/Nazara/Utility/GuillotineImageAtlas.cpp @@ -138,9 +138,7 @@ namespace Nz } } - // It shouldn't be possible to get here (TODO: Add NAZARA_UNREACHEABLE) - NazaraInternalError("unknown error"); - return false; + NAZARA_UNREACHABLE(); } void GuillotineImageAtlas::SetMaxLayerSize(unsigned int maxLayerSize) diff --git a/xmake.lua b/xmake.lua index ddcad1256..163ff1ba6 100644 --- a/xmake.lua +++ b/xmake.lua @@ -266,7 +266,7 @@ end add_repositories("nazara-engine-repo https://github.com/NazaraEngine/xmake-repo") -add_requires("entt 3.13.0", "fmt", "frozen", "nazarautils >=2024.01.13", "utfcpp") +add_requires("entt 3.13.0", "fmt", "frozen", "nazarautils >=2024.01.25", "utfcpp") -- Module dependencies if has_config("audio") then