summaryrefslogtreecommitdiff
path: root/libcxxabi
diff options
context:
space:
mode:
authorErik Pilkington <erik.pilkington@gmail.com>2018-07-03 00:23:18 +0000
committerErik Pilkington <erik.pilkington@gmail.com>2018-07-03 00:23:18 +0000
commita1b630211c43d866d1ff1a7a21c52968a7e69ec8 (patch)
treebb3cd58e6b47707a7c8b525212388ea4cc9232b7 /libcxxabi
parent6a3304c422b0dd6f171e4279a41276cb71990002 (diff)
[demangler] Fix a MSVC alignment warning.
This should fix llvm.org/PR37944
Diffstat (limited to 'libcxxabi')
-rw-r--r--libcxxabi/src/cxa_demangle.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/libcxxabi/src/cxa_demangle.cpp b/libcxxabi/src/cxa_demangle.cpp
index d70ffdf1065..1cdc29b811c 100644
--- a/libcxxabi/src/cxa_demangle.cpp
+++ b/libcxxabi/src/cxa_demangle.cpp
@@ -19,6 +19,7 @@
#include <algorithm>
#include <numeric>
#include <cassert>
+#include <cstddef>
#include <cstdio>
#include <cstdlib>
#include <cstring>
@@ -1890,7 +1891,7 @@ class BumpPointerAllocator {
static constexpr size_t AllocSize = 4096;
static constexpr size_t UsableAllocSize = AllocSize - sizeof(BlockMeta);
- alignas(16) char InitialBuffer[AllocSize];
+ alignas(std::max_align_t) char InitialBuffer[AllocSize];
BlockMeta* BlockList = nullptr;
void grow() {