Squashed 'deps/nostalgia/' changes from 672b92b3..f987b02c
f987b02c [nostalgia/gfx] Move to TileSheetV5 3c056276 [turbine,nostalgia] Cleanup 87e2fdef [ox/std] Make UAnyPtr uncopyable git-subtree-dir: deps/nostalgia git-subtree-split: f987b02c657802c25061e6786fc28c562877c9c6
This commit is contained in:
8
deps/ox/src/ox/std/anyptr.hpp
vendored
8
deps/ox/src/ox/std/anyptr.hpp
vendored
@ -64,7 +64,7 @@ class AnyPtrT {
|
||||
}
|
||||
}
|
||||
|
||||
constexpr AnyPtrT(AnyPtrT const&other) noexcept {
|
||||
constexpr AnyPtrT(AnyPtrT const&other) noexcept requires(!unique) {
|
||||
if (other) {
|
||||
m_wrapPtr = other.m_wrapPtr->copyTo(m_wrapData);
|
||||
}
|
||||
@ -104,11 +104,9 @@ class AnyPtrT {
|
||||
return *this;
|
||||
}
|
||||
|
||||
constexpr AnyPtrT &operator=(AnyPtrT const&ptr) noexcept {
|
||||
constexpr AnyPtrT &operator=(AnyPtrT const&ptr) noexcept requires(!unique) {
|
||||
if (this != &ptr) {
|
||||
if constexpr(unique) {
|
||||
free();
|
||||
} else if (std::is_constant_evaluated()) {
|
||||
if (std::is_constant_evaluated()) {
|
||||
ox::safeDelete(m_wrapPtr);
|
||||
}
|
||||
if (ptr) {
|
||||
|
Reference in New Issue
Block a user