From 4edf73344f060706d316b9f43d9249ef604a6ea9 Mon Sep 17 00:00:00 2001 From: bunnei Date: Sun, 3 Nov 2019 04:39:51 -0500 Subject: Revert "common_func: Use std::array for INSERT_PADDING_* macros." --- src/common/common_funcs.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/common/common_funcs.h b/src/common/common_funcs.h index 79a0383db..04ecac959 100644 --- a/src/common/common_funcs.h +++ b/src/common/common_funcs.h @@ -5,7 +5,6 @@ #pragma once #include -#include #include #if !defined(ARCHITECTURE_x86_64) @@ -20,8 +19,8 @@ // helper macro to properly align structure members. // Calling INSERT_PADDING_BYTES will add a new member variable with a name like "pad121", // depending on the current source line to make sure variable names are unique. -#define INSERT_PADDING_BYTES(num_bytes) std::array CONCAT2(pad, __LINE__) -#define INSERT_PADDING_WORDS(num_words) std::array CONCAT2(pad, __LINE__) +#define INSERT_PADDING_BYTES(num_bytes) u8 CONCAT2(pad, __LINE__)[(num_bytes)] +#define INSERT_PADDING_WORDS(num_words) u32 CONCAT2(pad, __LINE__)[(num_words)] // Inlining #ifdef _WIN32 -- cgit v1.2.3