commit 2e74fdaa4a847a6ed2d89f57eaf9936e05bd5169
author David Benjamin <davidben@google.com> Mon Jul 02 15:14:45 2018 -0400
committer Adam Langley <agl@google.com> Tue Jul 03 22:11:32 2018 +0000
tree 765c29c060cfc6b0a7d86f65d5bd0b30923354e8
parent aaef8334335a45949bc7dc05ffb40dd43d6e1709

Don't redefine alignas in C++.

alignas in C++11 is a bit more flexible than
__attribute__((aligned(x))), and we already require C++11 in tests.

Change-Id: If61c35daa5fcaaca5119dcc6808a3e746befc170
Reviewed-on: https://boringssl-review.googlesource.com/29544
Reviewed-by: Adam Langley <agl@google.com>

crypto/internal.h

diff --git a/crypto/internal.h b/crypto/internal.h
index 48bbae9..3dde476 100644
--- a/crypto/internal.h
+++ b/crypto/internal.h
@@ -116,6 +116,7 @@
 #include <assert.h>
 #include <string.h>
 
+#if !defined(__cplusplus)
 #if defined(__GNUC__) && \
     (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) < 40800
 // |alignas| and |alignof| were added in C11. GCC added support in version 4.8.
@@ -123,8 +124,7 @@
 // reports support for C11.
 #define alignas(x) __attribute__ ((aligned (x)))
 #define alignof(x) __alignof__ (x)
-#elif !defined(__cplusplus)
-#if defined(_MSC_VER)
+#elif defined(_MSC_VER)
 #define alignas(x) __declspec(align(x))
 #define alignof __alignof
 #else