Don't pass an unnecessarily large alignment to allocator::rebind

1 files changed, 4 insertions, 2 deletions

diff --git a/common/almalloc.h b/common/almalloc.h
index 809f4f1f..b5821784 100644
--- a/common/almalloc.h
+++ b/common/almalloc.h
@@ -72,8 +72,10 @@ enum FamCount : size_t { };
 
 namespace al {
 
-template<typename T, std::size_t alignment=alignof(T)>
+template<typename T, std::size_t Align=alignof(T)>
 struct allocator {
+    static constexpr std::size_t alignment{std::max(Align, alignof(T))};
+
     using value_type = T;
     using reference = T&;
     using const_reference = const T&;
@@ -85,7 +87,7 @@ struct allocator {
 
     template<typename U>
     struct rebind {
-        using other = allocator<U, (alignment<alignof(U))?alignof(U):alignment>;
+        using other = allocator<U, Align>;
     };
 
     constexpr explicit allocator() noexcept = default;