From 445ed93fbbabaea089ac2e213034e0018f3af470 Mon Sep 17 00:00:00 2001 From: SirLynix Date: Mon, 24 Apr 2023 10:58:16 +0200 Subject: [PATCH] Core/ApplicationBase: Fix compilation with Apple Clang --- include/Nazara/Core/ApplicationBase.hpp | 2 +- include/Nazara/Core/ApplicationBase.inl | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/include/Nazara/Core/ApplicationBase.hpp b/include/Nazara/Core/ApplicationBase.hpp index 9f43446ff..90dcf4943 100644 --- a/include/Nazara/Core/ApplicationBase.hpp +++ b/include/Nazara/Core/ApplicationBase.hpp @@ -52,7 +52,7 @@ namespace Nz template T& AddComponent(Args&&... args); private: - template void AddUpdaterFunc(Time interval, F&& functor); + template void AddUpdaterFunc(Time interval, F&& functor); struct Updater { diff --git a/include/Nazara/Core/ApplicationBase.inl b/include/Nazara/Core/ApplicationBase.inl index 36ba093e9..60c612304 100644 --- a/include/Nazara/Core/ApplicationBase.inl +++ b/include/Nazara/Core/ApplicationBase.inl @@ -93,17 +93,16 @@ namespace Nz return componentRef; } - template + template void ApplicationBase::AddUpdaterFunc(Time interval, F&& functor) { if constexpr (std::is_invocable_r_v || std::is_invocable_r_v) - return AddUpdater(std::make_unique, FixedInterval>>(std::forward(functor), interval)); + return AddUpdater(std::make_unique, Fixed>>(std::forward(functor), interval)); else if constexpr (std::is_invocable_r_v || std::is_invocable_r_v) return AddUpdater(std::make_unique>>(std::forward(functor))); else static_assert(AlwaysFalse(), "functor must be callable with either elapsed time or nothing and return void or next update time"); } - } #include