deps/ox/src/ox/std/anyptr.hpp

@@ -30,7 +30,7 @@ class AnyPtrT {
 		template<typename T>
 		struct Wrap final: WrapBase {
 			T *data{};
-			explicit constexpr Wrap(T *pData) noexcept: data(pData) {
+			constexpr Wrap(T *pData) noexcept: data(pData) {
 			}
 			constexpr WrapBase *copyTo(ox::Span<char> s) noexcept override {
 				oxAssert(s.size() >= sizeof(Wrap), "too small buffer");
@@ -44,7 +44,7 @@ class AnyPtrT {
 				return data != nullptr;
 			}
 			constexpr void free() noexcept override {
-				safeDelete(data);
+				ox::safeDelete(data);
 				data = {};
 			}
 		};

src/nostalgia/modules/core/include/nostalgia/core/context.hpp

@@ -17,9 +17,11 @@ namespace nostalgia::core {
 
 class Context;
 
-void safeDelete(Context *ctx) noexcept;
+struct ContextDeleter {
+	void operator()(Context *p) noexcept;
+};
 
-using ContextUPtr = ox::UPtr<Context>;
+using ContextUPtr = ox::UPtr<Context, ContextDeleter>;
 
 ox::Result<ContextUPtr> init(turbine::Context &tctx, InitParams const&params = {}) noexcept;
 

src/nostalgia/modules/core/src/gba/context.cpp

@@ -10,8 +10,8 @@
 
 namespace nostalgia::core {
 
-void safeDelete(Context *ctx) noexcept {
+void ContextDeleter::operator()(Context *p) noexcept {
-	delete ctx;
+	ox::safeDelete(p);
 }
 
 Context::Context(turbine::Context &tctx) noexcept: turbineCtx(tctx) {

src/nostalgia/modules/core/src/opengl/context.cpp

@@ -7,8 +7,8 @@
 
 namespace nostalgia::core {
 
-void safeDelete(Context *ctx) noexcept {
+void ContextDeleter::operator()(Context *p) noexcept {
-	delete ctx;
+	ox::safeDelete(p);
 }
 
 Context::Context(turbine::Context &tctx, InitParams const&params) noexcept: