From f2e34efcbba4af82d69c400a5ce36af379f575fc Mon Sep 17 00:00:00 2001 From: Lioncash Date: Thu, 14 Nov 2019 16:54:01 -0500 Subject: common_funcs: Remove semicolons from INSERT_PADDING_* macros Makes code that uses the macros consistent by requiring the lines to be terminated with a semicolon. --- src/common/common_funcs.h | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/common/common_funcs.h b/src/common/common_funcs.h index 6dc3e108f..052254678 100644 --- a/src/common/common_funcs.h +++ b/src/common/common_funcs.h @@ -19,13 +19,15 @@ /// Helper macros to insert unused bytes or words to properly align structs. These values will be /// zero-initialized. -#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) \ + std::array CONCAT2(pad, __LINE__) {} +#define INSERT_PADDING_WORDS(num_words) \ + std::array CONCAT2(pad, __LINE__) {} /// These are similar to the INSERT_PADDING_* macros, but are needed for padding unions. This is /// because unions can only be initialized by one member. -#define INSERT_UNION_PADDING_BYTES(num_bytes) std::array CONCAT2(pad, __LINE__); -#define INSERT_UNION_PADDING_WORDS(num_words) std::array CONCAT2(pad, __LINE__); +#define INSERT_UNION_PADDING_BYTES(num_bytes) std::array CONCAT2(pad, __LINE__) +#define INSERT_UNION_PADDING_WORDS(num_words) std::array CONCAT2(pad, __LINE__) #ifndef _MSC_VER -- cgit v1.2.3