From a79a15a878000e8eeb427e8ca542a08f0103cbf5 Mon Sep 17 00:00:00 2001 From: Mark Lacey Date: Tue, 12 Jun 2018 08:53:13 -0700 Subject: [PATCH] Revert "runtime: use `std::max_align_t` over `max_align_t` (NFC)" This reverts commit 638b89d12d273a0ede166a055a501c6a7559f3c9. It resulted in the Linux CI bots failing. --- stdlib/public/runtime/Casting.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/stdlib/public/runtime/Casting.cpp b/stdlib/public/runtime/Casting.cpp index 5be857d5fd7e2..0b58d4984a4b0 100644 --- a/stdlib/public/runtime/Casting.cpp +++ b/stdlib/public/runtime/Casting.cpp @@ -40,7 +40,6 @@ #include "SwiftValue.h" #endif -#include #include #include @@ -2667,7 +2666,7 @@ static bool _dynamicCastClassToValueViaObjCBridgeable( // Allocate a buffer to store the T? returned by bridging. // The extra byte is for the tag. const std::size_t inlineValueSize = 3 * sizeof(void*); - alignas(std::max_align_t) char inlineBuffer[inlineValueSize + 1]; + alignas(max_align_t) char inlineBuffer[inlineValueSize + 1]; void *optDestBuffer; if (targetType->getValueWitnesses()->getStride() <= inlineValueSize) { // Use the inline buffer.