diff options
| author | Rodrigo Locatti <reinuseslisp@airmail.cc> | 2019-11-15 00:29:51 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-15 00:29:51 +0100 |
| commit | bb31df62bb3430ed254a81859c44ff864b614e8e (patch) | |
| tree | 7ebeb364131b4dd7f4d87ffcfd3088b029e1ff34 /src | |
| parent | Merge pull request #3110 from greggameplayer/CompleteRGBA16UI (diff) | |
| parent | common_funcs: Remove semicolons from INSERT_PADDING_* macros (diff) | |
| download | yuzu-bb31df62bb3430ed254a81859c44ff864b614e8e.tar yuzu-bb31df62bb3430ed254a81859c44ff864b614e8e.tar.gz yuzu-bb31df62bb3430ed254a81859c44ff864b614e8e.tar.bz2 yuzu-bb31df62bb3430ed254a81859c44ff864b614e8e.tar.lz yuzu-bb31df62bb3430ed254a81859c44ff864b614e8e.tar.xz yuzu-bb31df62bb3430ed254a81859c44ff864b614e8e.tar.zst yuzu-bb31df62bb3430ed254a81859c44ff864b614e8e.zip | |
Diffstat (limited to 'src')
| -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 |