Browse Source
Merge pull request #3113 from lioncash/semi
common_funcs: Remove semicolons from INSERT_PADDING_* macros
pull/15/merge
Rodrigo Locatti
6 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with
6 additions and
4 deletions
-
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<u8, num_bytes> CONCAT2(pad, __LINE__){}; |
|
|
|
#define INSERT_PADDING_WORDS(num_words) std::array<u32, num_words> CONCAT2(pad, __LINE__){}; |
|
|
|
#define INSERT_PADDING_BYTES(num_bytes) \ |
|
|
|
std::array<u8, num_bytes> CONCAT2(pad, __LINE__) {} |
|
|
|
#define INSERT_PADDING_WORDS(num_words) \ |
|
|
|
std::array<u32, num_words> 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<u8, num_bytes> CONCAT2(pad, __LINE__); |
|
|
|
#define INSERT_UNION_PADDING_WORDS(num_words) std::array<u32, num_words> CONCAT2(pad, __LINE__); |
|
|
|
#define INSERT_UNION_PADDING_BYTES(num_bytes) std::array<u8, num_bytes> CONCAT2(pad, __LINE__) |
|
|
|
#define INSERT_UNION_PADDING_WORDS(num_words) std::array<u32, num_words> CONCAT2(pad, __LINE__) |
|
|
|
|
|
|
|
#ifndef _MSC_VER |
|
|
|
|
|
|
|
|
