diff options
| author | 2019-10-06 23:30:54 +0000 | |
|---|---|---|
| committer | 2019-10-06 23:30:54 +0000 | |
| commit | 3cb4c9f08afc57e40fc103e2d087cde7c48bf153 (patch) | |
| tree | 23ef1f71eeb49bcc75668cf9180c5c3b6afea681 | |
| parent | Merge pull request #2954 from ReinUsesLisp/fix-invalidation (diff) | |
| parent | alignment: Resolve allocator construction issues on debug (diff) | |
| download | yuzu-3cb4c9f08afc57e40fc103e2d087cde7c48bf153.tar.gz yuzu-3cb4c9f08afc57e40fc103e2d087cde7c48bf153.tar.xz yuzu-3cb4c9f08afc57e40fc103e2d087cde7c48bf153.zip | |
Merge pull request #2955 from lioncash/allocator
alignment: Resolve allocator construction issues on debug
Diffstat (limited to '')
| -rw-r--r-- | src/common/alignment.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/src/common/alignment.h b/src/common/alignment.h index 88d5d3a65..cdd4833f8 100644 --- a/src/common/alignment.h +++ b/src/common/alignment.h | |||
| @@ -51,7 +51,17 @@ public: | |||
| 51 | using reference = T&; | 51 | using reference = T&; |
| 52 | using const_reference = const T&; | 52 | using const_reference = const T&; |
| 53 | 53 | ||
| 54 | using propagate_on_container_copy_assignment = std::true_type; | ||
| 55 | using propagate_on_container_move_assignment = std::true_type; | ||
| 56 | using propagate_on_container_swap = std::true_type; | ||
| 57 | using is_always_equal = std::true_type; | ||
| 58 | |||
| 54 | public: | 59 | public: |
| 60 | constexpr AlignmentAllocator() noexcept = default; | ||
| 61 | |||
| 62 | template <typename T2> | ||
| 63 | constexpr AlignmentAllocator(const AlignmentAllocator<T2, Align>&) noexcept {} | ||
| 64 | |||
| 55 | pointer address(reference r) noexcept { | 65 | pointer address(reference r) noexcept { |
| 56 | return std::addressof(r); | 66 | return std::addressof(r); |
| 57 | } | 67 | } |