Compare commits
2 Commits
92e9d9cbfc
...
7a21b20711
Author | SHA1 | Date | |
---|---|---|---|
7a21b20711 | |||
894be237f2 |
4
deps/ox/src/ox/std/anyptr.hpp
vendored
4
deps/ox/src/ox/std/anyptr.hpp
vendored
@ -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 = {};
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
@ -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¶ms = {}) noexcept;
|
ox::Result<ContextUPtr> init(turbine::Context &tctx, InitParams const¶ms = {}) noexcept;
|
||||||
|
|
||||||
|
@ -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) {
|
||||||
|
@ -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¶ms) noexcept:
|
Context::Context(turbine::Context &tctx, InitParams const¶ms) noexcept:
|
||||||
|
Loading…
x
Reference in New Issue
Block a user