Browse Source
Merge pull request #8587 from merryhime/padding-unused
common_funcs: Mark padding as [[maybe_unused]]
pull/15/merge
Morph
3 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
|
|
|
@ -18,14 +18,16 @@ |
|
|
|
/// 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__) {} |
|
|
|
[[maybe_unused]] std::array<u8, num_bytes> CONCAT2(pad, __LINE__) {} |
|
|
|
#define INSERT_PADDING_WORDS(num_words) \ |
|
|
|
std::array<u32, num_words> CONCAT2(pad, __LINE__) {} |
|
|
|
[[maybe_unused]] std::array<u32, num_words> CONCAT2(pad, __LINE__) {} |
|
|
|
|
|
|
|
/// These are similar to the INSERT_PADDING_* macros but do not zero-initialize the contents. |
|
|
|
/// This keeps the structure trivial to construct. |
|
|
|
#define INSERT_PADDING_BYTES_NOINIT(num_bytes) std::array<u8, num_bytes> CONCAT2(pad, __LINE__) |
|
|
|
#define INSERT_PADDING_WORDS_NOINIT(num_words) std::array<u32, num_words> CONCAT2(pad, __LINE__) |
|
|
|
#define INSERT_PADDING_BYTES_NOINIT(num_bytes) \ |
|
|
|
[[maybe_unused]] std::array<u8, num_bytes> CONCAT2(pad, __LINE__) |
|
|
|
#define INSERT_PADDING_WORDS_NOINIT(num_words) \ |
|
|
|
[[maybe_unused]] std::array<u32, num_words> CONCAT2(pad, __LINE__) |
|
|
|
|
|
|
|
#ifndef _MSC_VER |
|
|
|
|
|
|
|
|