diff --git a/deps/nostalgia/src/nostalgia/modules/core/include/nostalgia/core/context.hpp b/deps/nostalgia/src/nostalgia/modules/core/include/nostalgia/core/context.hpp index 9fcffb2..2f2df27 100644 --- a/deps/nostalgia/src/nostalgia/modules/core/include/nostalgia/core/context.hpp +++ b/deps/nostalgia/src/nostalgia/modules/core/include/nostalgia/core/context.hpp @@ -17,11 +17,9 @@ namespace nostalgia::core { class Context; -struct ContextDeleter { - void operator()(Context *p) noexcept; -}; +void safeDelete(Context *ctx) noexcept; -using ContextUPtr = ox::UPtr; +using ContextUPtr = ox::UPtr; ox::Result init(turbine::Context &tctx, InitParams const¶ms = {}) noexcept; diff --git a/deps/nostalgia/src/nostalgia/modules/core/src/gba/context.cpp b/deps/nostalgia/src/nostalgia/modules/core/src/gba/context.cpp index d54262d..ab378d3 100644 --- a/deps/nostalgia/src/nostalgia/modules/core/src/gba/context.cpp +++ b/deps/nostalgia/src/nostalgia/modules/core/src/gba/context.cpp @@ -10,8 +10,8 @@ namespace nostalgia::core { -void ContextDeleter::operator()(Context *p) noexcept { - ox::safeDelete(p); +void safeDelete(Context *ctx) noexcept { + delete ctx; } Context::Context(turbine::Context &tctx) noexcept: turbineCtx(tctx) { diff --git a/deps/nostalgia/src/nostalgia/modules/core/src/opengl/context.cpp b/deps/nostalgia/src/nostalgia/modules/core/src/opengl/context.cpp index 0644e9a..fd727bc 100644 --- a/deps/nostalgia/src/nostalgia/modules/core/src/opengl/context.cpp +++ b/deps/nostalgia/src/nostalgia/modules/core/src/opengl/context.cpp @@ -7,8 +7,8 @@ namespace nostalgia::core { -void ContextDeleter::operator()(Context *p) noexcept { - ox::safeDelete(p); +void safeDelete(Context *ctx) noexcept { + delete ctx; } Context::Context(turbine::Context &tctx, InitParams const¶ms) noexcept: