diff options
Diffstat (limited to 'asl/memory')
| -rw-r--r-- | asl/memory/allocator.hpp | 4 | ||||
| -rw-r--r-- | asl/memory/memory.hpp | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/asl/memory/allocator.hpp b/asl/memory/allocator.hpp index 1628a8a..bb6b992 100644 --- a/asl/memory/allocator.hpp +++ b/asl/memory/allocator.hpp @@ -37,7 +37,7 @@ template<typename T> T* alloc_new(allocator auto& a, auto&&... args) { void* ptr = a.alloc(layout::of<T>()); - return construct_at<T>(ptr, ASL_FWD(args)...); + return construct_at<T>(ptr, std::forward<decltype(args)>(args)...); } template<typename T> @@ -50,7 +50,7 @@ void alloc_delete(allocator auto& a, T* ptr) template<typename T> constexpr T* alloc_new_default(auto&&... args) { - return alloc_new<T>(DefaultAllocator{}, ASL_FWD(args)...); + return alloc_new<T>(DefaultAllocator{}, std::forward<decltype(args)>(args)...); } template<typename T> diff --git a/asl/memory/memory.hpp b/asl/memory/memory.hpp index bf4e125..96ab562 100644 --- a/asl/memory/memory.hpp +++ b/asl/memory/memory.hpp @@ -41,7 +41,7 @@ template<typename T, typename... Args> constexpr T* construct_at(void* ptr, Args&&... args) requires constructible_from<T, Args&&...> { - return new (ptr) T{ ASL_FWD(args)... }; + return new (ptr) T{ std::forward<Args>(args)... }; // NOLINT(*-owning-memory) } template<typename T> @@ -112,7 +112,7 @@ constexpr void relocate_uninit_n(T* to, T* from, isize_t n) for (isize_t i = 0; i < n; ++i) { // NOLINTNEXTLINE(*-pointer-arithmetic) - construct_at<T>(to + i, ASL_MOVE(from[i])); + construct_at<T>(to + i, std::move(from[i])); } destroy_n(from, n); } @@ -131,7 +131,7 @@ constexpr void relocate_assign_n(T* to, T* from, isize_t n) for (isize_t i = 0; i < n; ++i) { // NOLINTNEXTLINE(*-pointer-arithmetic) - to[i] = ASL_MOVE(from[i]); + to[i] = std::move(from[i]); } destroy_n(from, n); } |