From fdc5791b08092a86ea9b70bb9bc5e0f8d9f869f0 Mon Sep 17 00:00:00 2001 From: bunnei Date: Sun, 3 Nov 2019 03:55:06 -0500 Subject: [PATCH] common_func: Use std::array for INSERT_PADDING_* macros. - Zero initialization here is useful for determinism. --- src/common/common_funcs.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/common/common_funcs.h b/src/common/common_funcs.h index 04ecac959b..79a0383dbe 100644 --- a/src/common/common_funcs.h +++ b/src/common/common_funcs.h @@ -5,6 +5,7 @@ #pragma once #include +#include #include #if !defined(ARCHITECTURE_x86_64) @@ -19,8 +20,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) u8 CONCAT2(pad, __LINE__)[(num_bytes)] -#define INSERT_PADDING_WORDS(num_words) u32 CONCAT2(pad, __LINE__)[(num_words)] +#define INSERT_PADDING_BYTES(num_bytes) std::array CONCAT2(pad, __LINE__) +#define INSERT_PADDING_WORDS(num_words) std::array CONCAT2(pad, __LINE__) // Inlining #ifdef _WIN32