From b5cfb492903369f8e2200b7a5aea0f8ca058d588 Mon Sep 17 00:00:00 2001
From: Gary Talent <gary@drinkingtea.net>
Date: Thu, 1 Dec 2022 02:33:45 -0600
Subject: [PATCH] [ox/preloader] Make Preloader::pad protected

(synced from 7c07fc972621374134811a36452cca911cfc99c8)
---
 src/ox/preloader/preloader.hpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/ox/preloader/preloader.hpp b/src/ox/preloader/preloader.hpp
index c8fe0ab2d..079725c6e 100644
--- a/src/ox/preloader/preloader.hpp
+++ b/src/ox/preloader/preloader.hpp
@@ -28,6 +28,9 @@ constexpr ox::Error preload(Preloader<PlatSpec> *pl, ox::CommonPtrWith<T> auto *
 
 template<typename PlatSpec>
 class Preloader: public ModelHandlerBase<Preloader<PlatSpec>> {
+	template<typename PS, typename T>
+	friend constexpr ox::Error preload(Preloader<PS> *pl, ox::CommonPtrWith<T> auto *obj) noexcept;
+
 	private:
 		class UnionIdxTracker {
 			private:
@@ -95,6 +98,7 @@ class Preloader: public ModelHandlerBase<Preloader<PlatSpec>> {
 			return ox::OpType::Write;
 		}
 
+	protected:
 		template<typename T>
 		constexpr ox::Error pad(const T*) noexcept;
 
@@ -293,8 +297,7 @@ constexpr bool Preloader<PlatSpec>::unionCheckAndIt() noexcept {
 
 template<typename PlatSpec, typename T>
 constexpr ox::Error preload(Preloader<PlatSpec> *pl, ox::CommonPtrWith<T> auto *obj) noexcept {
-	auto i = pl->interface();
-	oxReturnError(model(i, obj));
+	oxReturnError(model(pl->interface(), obj));
 	return pl->pad(obj);
 }