drinkingtea/jasper
drinkingtea/jasper
2
0
Fork 0
Code Issues 2 Pull Requests Actions Releases Activity

Squashed 'deps/nostalgia/' changes from 7233da75..eed115b2

Browse Source 
eed115b2 [keel] Fix a GCC break

git-subtree-dir: deps/nostalgia
git-subtree-split: eed115b2876124c9976d914313dac0f87fee8570
This commit is contained in:
Gary Talent 2024-05-18 12:17:23 -05:00
parent f48824793c
commit b66cef7127
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/olympic/keel/include/keel/pack.hpp
View File

@ -94,7 +94,7 @@ ox::Error preloadObj(
oxOutf("preloading {} as a {}\n", path, obj.type()->typeName); oxOutf("preloading {} as a {}\n", path, obj.type()->typeName);
// preload // preload
oxRequire(a, pl.startAlloc(ox::sizeOf<GbaPlatSpec>(&obj), ox::alignOf<GbaPlatSpec>(obj))); 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(pl.endAlloc());
oxReturnError(err); oxReturnError(err);
keel::PreloadPtr const p{.preloadAddr = static_cast<uint32_t>(a)}; keel::PreloadPtr const p{.preloadAddr = static_cast<uint32_t>(a)};