Compare commits

..

2 Commits

Author SHA1 Message Date
7a21b20711 [nostalgia/core] Replace ContextDeleter with safeDelete(Context*)
All checks were successful
Build / build (push) Successful in 3m15s
2025-01-18 20:57:15 -06:00
894be237f2 [ox/std] Drop ox:: qualifier from safeDelete function for pointee 2025-01-18 20:56:24 -06:00
4 changed files with 8 additions and 10 deletions

View File

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

View File

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

View File

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

View File

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