From 5cdf241321b7e23211ea971a22b989eac655e637 Mon Sep 17 00:00:00 2001 From: Gary Talent Date: Sun, 24 Sep 2023 09:50:18 -0500 Subject: [PATCH] [ox/preloader] Fix for what appears to be a bug in Apple Clang --- deps/ox/src/ox/preloader/preloader.hpp | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/deps/ox/src/ox/preloader/preloader.hpp b/deps/ox/src/ox/preloader/preloader.hpp index 3a2f53dc9..822daef96 100644 --- a/deps/ox/src/ox/preloader/preloader.hpp +++ b/deps/ox/src/ox/preloader/preloader.hpp @@ -23,14 +23,8 @@ namespace ox { template class Preloader; -template -constexpr ox::Error preload(Preloader *pl, ox::CommonPtrWith auto *obj) noexcept; - template class Preloader: public ModelHandlerBase> { - template - friend constexpr ox::Error preload(Preloader *pl, ox::CommonPtrWith auto *obj) noexcept; - private: using PtrType = typename PlatSpec::PtrType; static constexpr auto PtrSize = sizeof(PtrType); @@ -119,7 +113,6 @@ class Preloader: public ModelHandlerBase> { return ox::OpType::Write; } - protected: template constexpr ox::Error pad(const T*) noexcept; @@ -359,8 +352,7 @@ constexpr bool Preloader::unionCheckAndIt() noexcept { } template -constexpr ox::Error preload( - Preloader *pl, ox::CommonPtrWith auto *obj) noexcept { +constexpr ox::Error preload(Preloader *pl, ox::CommonPtrWith auto *obj) noexcept { oxReturnError(model(pl->interface(), obj)); return pl->pad(obj); }