diff options
| author | 2019-11-14 20:29:51 -0300 | |
|---|---|---|
| committer | 2019-11-14 20:29:51 -0300 | |
| commit | bb31df62bb3430ed254a81859c44ff864b614e8e (patch) | |
| tree | 7ebeb364131b4dd7f4d87ffcfd3088b029e1ff34 /src/common | |
| parent | Merge pull request #3110 from greggameplayer/CompleteRGBA16UI (diff) | |
| parent | common_funcs: Remove semicolons from INSERT_PADDING_* macros (diff) | |
| download | yuzu-bb31df62bb3430ed254a81859c44ff864b614e8e.tar.gz yuzu-bb31df62bb3430ed254a81859c44ff864b614e8e.tar.xz yuzu-bb31df62bb3430ed254a81859c44ff864b614e8e.zip | |
Merge pull request #3113 from lioncash/semi
common_funcs: Remove semicolons from INSERT_PADDING_* macros
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/common_funcs.h | 10 |
1 files 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 @@ | |||
| 19 | 19 | ||
| 20 | /// Helper macros to insert unused bytes or words to properly align structs. These values will be | 20 | /// Helper macros to insert unused bytes or words to properly align structs. These values will be |
| 21 | /// zero-initialized. | 21 | /// zero-initialized. |
| 22 | #define INSERT_PADDING_BYTES(num_bytes) std::array<u8, num_bytes> CONCAT2(pad, __LINE__){}; | 22 | #define INSERT_PADDING_BYTES(num_bytes) \ |
| 23 | #define INSERT_PADDING_WORDS(num_words) std::array<u32, num_words> CONCAT2(pad, __LINE__){}; | 23 | std::array<u8, num_bytes> CONCAT2(pad, __LINE__) {} |
| 24 | #define INSERT_PADDING_WORDS(num_words) \ | ||
| 25 | std::array<u32, num_words> CONCAT2(pad, __LINE__) {} | ||
| 24 | 26 | ||
| 25 | /// These are similar to the INSERT_PADDING_* macros, but are needed for padding unions. This is | 27 | /// These are similar to the INSERT_PADDING_* macros, but are needed for padding unions. This is |
| 26 | /// because unions can only be initialized by one member. | 28 | /// because unions can only be initialized by one member. |
| 27 | #define INSERT_UNION_PADDING_BYTES(num_bytes) std::array<u8, num_bytes> CONCAT2(pad, __LINE__); | 29 | #define INSERT_UNION_PADDING_BYTES(num_bytes) std::array<u8, num_bytes> CONCAT2(pad, __LINE__) |
| 28 | #define INSERT_UNION_PADDING_WORDS(num_words) std::array<u32, num_words> CONCAT2(pad, __LINE__); | 30 | #define INSERT_UNION_PADDING_WORDS(num_words) std::array<u32, num_words> CONCAT2(pad, __LINE__) |
| 29 | 31 | ||
| 30 | #ifndef _MSC_VER | 32 | #ifndef _MSC_VER |
| 31 | 33 | ||