diff options
| author | Lioncash <mathew1800@gmail.com> | 2019-11-14 22:54:01 +0100 |
|---|---|---|
| committer | Lioncash <mathew1800@gmail.com> | 2019-11-14 23:05:27 +0100 |
| commit | f2e34efcbba4af82d69c400a5ce36af379f575fc (patch) | |
| tree | f676d7e37e2d0cc1a2e44e0611eaabc0b3b68e25 | |
| parent | Merge pull request #3089 from SciresM/play_statistics (diff) | |
| download | yuzu-f2e34efcbba4af82d69c400a5ce36af379f575fc.tar yuzu-f2e34efcbba4af82d69c400a5ce36af379f575fc.tar.gz yuzu-f2e34efcbba4af82d69c400a5ce36af379f575fc.tar.bz2 yuzu-f2e34efcbba4af82d69c400a5ce36af379f575fc.tar.lz yuzu-f2e34efcbba4af82d69c400a5ce36af379f575fc.tar.xz yuzu-f2e34efcbba4af82d69c400a5ce36af379f575fc.tar.zst yuzu-f2e34efcbba4af82d69c400a5ce36af379f575fc.zip | |
| -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 @@ /// 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 |