Squashed 'deps/nostalgia/' changes from e27eee50..f7c3c02c
f7c3c02c Merge commit '1bfb7f99c215e2c74556bd3281f44962b8faaa96' 8f0f1fea [nostalgia/gfx/studio] Make editors use Project::loadObj for their primary assets 2f36a3f6 [studio] Add File -> Reload Project menu item 07e5bf90 [keel] Make keel attempt to delete all existing assets when FS is changed aacff3da [ox/std] Fix UPtr::reset to conform to unique_ptr::reset git-subtree-dir: deps/nostalgia git-subtree-split: f7c3c02c4cbe676ea116ea53f1f31b27f668cd98
This commit is contained in:
3
deps/ox/src/ox/std/memory.hpp
vendored
3
deps/ox/src/ox/std/memory.hpp
vendored
@@ -213,8 +213,7 @@ class UniquePtr {
|
||||
return m_t;
|
||||
}
|
||||
|
||||
template<typename U, typename UDeleter>
|
||||
constexpr void reset(UniquePtr<U, UDeleter> &&other = UniquePtr()) {
|
||||
constexpr void reset(UniquePtr &&other = UniquePtr()) {
|
||||
auto t = m_t;
|
||||
m_t = other.release();
|
||||
Deleter()(t);
|
||||
|
Reference in New Issue
Block a user