diff options
author | bunnei <bunneidev@gmail.com> | 2020-07-18 07:04:17 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-07-18 07:04:17 +0200 |
commit | bbeea7502c5bff0f6343c2a4caaa2634d0e59028 (patch) | |
tree | 6f196835f67549555409e30a7e78c904d51fb3fc | |
parent | Merge pull request #4345 from Morph1984/fix-createfile (diff) | |
parent | alignment: Simplify AlignmentAllocator implementation (diff) | |
download | yuzu-bbeea7502c5bff0f6343c2a4caaa2634d0e59028.tar yuzu-bbeea7502c5bff0f6343c2a4caaa2634d0e59028.tar.gz yuzu-bbeea7502c5bff0f6343c2a4caaa2634d0e59028.tar.bz2 yuzu-bbeea7502c5bff0f6343c2a4caaa2634d0e59028.tar.lz yuzu-bbeea7502c5bff0f6343c2a4caaa2634d0e59028.tar.xz yuzu-bbeea7502c5bff0f6343c2a4caaa2634d0e59028.tar.zst yuzu-bbeea7502c5bff0f6343c2a4caaa2634d0e59028.zip |
-rw-r--r-- | src/common/alignment.h | 47 |
1 files changed, 4 insertions, 43 deletions
diff --git a/src/common/alignment.h b/src/common/alignment.h index b37044bb6..4025ba651 100644 --- a/src/common/alignment.h +++ b/src/common/alignment.h @@ -3,7 +3,6 @@ #pragma once #include <cstddef> -#include <memory> #include <type_traits> namespace Common { @@ -54,66 +53,28 @@ public: using size_type = std::size_t; using difference_type = std::ptrdiff_t; - using pointer = T*; - using const_pointer = const T*; - - using reference = T&; - using const_reference = const T&; - using propagate_on_container_copy_assignment = std::true_type; using propagate_on_container_move_assignment = std::true_type; using propagate_on_container_swap = std::true_type; using is_always_equal = std::true_type; -public: constexpr AlignmentAllocator() noexcept = default; template <typename T2> constexpr AlignmentAllocator(const AlignmentAllocator<T2, Align>&) noexcept {} - pointer address(reference r) noexcept { - return std::addressof(r); - } - - const_pointer address(const_reference r) const noexcept { - return std::addressof(r); - } - - pointer allocate(size_type n) { - return static_cast<pointer>(::operator new (n, std::align_val_t{Align})); - } - - void deallocate(pointer p, size_type) { - ::operator delete (p, std::align_val_t{Align}); + T* allocate(size_type n) { + return static_cast<T*>(::operator new (n * sizeof(T), std::align_val_t{Align})); } - void construct(pointer p, const value_type& wert) { - new (p) value_type(wert); - } - - void destroy(pointer p) { - p->~value_type(); - } - - size_type max_size() const noexcept { - return size_type(-1) / sizeof(value_type); + void deallocate(T* p, size_type n) { + ::operator delete (p, n * sizeof(T), std::align_val_t{Align}); } template <typename T2> struct rebind { using other = AlignmentAllocator<T2, Align>; }; - - bool operator!=(const AlignmentAllocator<T, Align>& other) const noexcept { - return !(*this == other); - } - - // Returns true if and only if storage allocated from *this - // can be deallocated from other, and vice versa. - // Always returns true for stateless allocators. - bool operator==(const AlignmentAllocator<T, Align>& other) const noexcept { - return true; - } }; } // namespace Common |