From f0bc9d8a9b45a86cf0736a3f118b28ae6fdb90f0 Mon Sep 17 00:00:00 2001
From: Chris Robinson <chris.kcat@gmail.com>
Date: Mon, 3 Jun 2019 22:58:56 -0700
Subject: Improve alignment handling for the alignment allocator

---
 common/almalloc.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'common/almalloc.h')

diff --git a/common/almalloc.h b/common/almalloc.h
index 406c2d31..0d77c46d 100644
--- a/common/almalloc.h
+++ b/common/almalloc.h
@@ -39,7 +39,7 @@ int al_is_sane_alignment_allocator(void) noexcept;
 
 namespace al {
 
-template<typename T, size_t alignment=DEF_ALIGN>
+template<typename T, size_t alignment=alignof(T)>
 struct allocator : public std::allocator<T> {
     using size_type = size_t;
     using pointer = T*;
@@ -97,7 +97,7 @@ std::unique_ptr<T> make_unique(ArgsT&&...args)
  * struct, with placement new, to have a run-time-sized array that's embedded
  * with its size.
  */
-template<typename T,size_t alignment=DEF_ALIGN>
+template<typename T, size_t alignment=alignof(T)>
 struct FlexArray {
     const size_t mSize;
     alignas(alignment) T mArray[];
-- 
cgit v1.2.3