From b66cef7127e97269fc6072a6f66ccc08990f6d2e Mon Sep 17 00:00:00 2001
From: Gary Talent <gary@drinkingtea.net>
Date: Sat, 18 May 2024 12:17:23 -0500
Subject: [PATCH] Squashed 'deps/nostalgia/' changes from 7233da75..eed115b2

eed115b2 [keel] Fix a GCC break

git-subtree-dir: deps/nostalgia
git-subtree-split: eed115b2876124c9976d914313dac0f87fee8570
---
 src/olympic/keel/include/keel/pack.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/olympic/keel/include/keel/pack.hpp b/src/olympic/keel/include/keel/pack.hpp
index 3f7afe4..ed21ee2 100644
--- a/src/olympic/keel/include/keel/pack.hpp
+++ b/src/olympic/keel/include/keel/pack.hpp
@@ -94,7 +94,7 @@ ox::Error preloadObj(
 		oxOutf("preloading {} as a {}\n", path, obj.type()->typeName);
 		// preload
 		oxRequire(a, pl.startAlloc(ox::sizeOf<GbaPlatSpec>(&obj), ox::alignOf<GbaPlatSpec>(obj)));
-		auto const err = ox::preload<GbaPlatSpec, decltype(obj)>(&pl, &obj);
+		auto const err = ox::preload<GbaPlatSpec, ox::ModelObject>(&pl, &obj);
 		oxReturnError(pl.endAlloc());
 		oxReturnError(err);
 		keel::PreloadPtr const p{.preloadAddr = static_cast<uint32_t>(a)};