diff options
| author |  bunnei | 2019-11-03 03:55:06 -0500 |
|---|---|---|
| committer | bunnei | 2019-11-03 04:30:16 -0500 |
| commit | fdc5791b08092a86ea9b70bb9bc5e0f8d9f869f0 (patch) | |
| tree | 3bb476f82e612e42997e72d423a7bf3586de2248 /src | |
| parent | Merge pull request #3058 from FearlessTobi/port-4948 (diff) | |
| download | yuzu-fdc5791b08092a86ea9b70bb9bc5e0f8d9f869f0.tar.gz yuzu-fdc5791b08092a86ea9b70bb9bc5e0f8d9f869f0.tar.xz yuzu-fdc5791b08092a86ea9b70bb9bc5e0f8d9f869f0.zip | |
common_func: Use std::array for INSERT_PADDING_* macros.
- Zero initialization here is useful for determinism.
Diffstat (limited to 'src')
| -rw-r--r-- | src/common/common_funcs.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/common/common_funcs.h b/src/common/common_funcs.h index 04ecac959..79a0383db 100644 --- a/src/common/common_funcs.h +++ b/src/common/common_funcs.h | |||
| @@ -5,6 +5,7 @@ | |||
| 5 | #pragma once | 5 | #pragma once |
| 6 | 6 | ||
| 7 | #include <algorithm> | 7 | #include <algorithm> |
| 8 | #include <array> | ||
| 8 | #include <string> | 9 | #include <string> |
| 9 | 10 | ||
| 10 | #if !defined(ARCHITECTURE_x86_64) | 11 | #if !defined(ARCHITECTURE_x86_64) |
| @@ -19,8 +20,8 @@ | |||
| 19 | // helper macro to properly align structure members. | 20 | // helper macro to properly align structure members. |
| 20 | // Calling INSERT_PADDING_BYTES will add a new member variable with a name like "pad121", | 21 | // Calling INSERT_PADDING_BYTES will add a new member variable with a name like "pad121", |
| 21 | // depending on the current source line to make sure variable names are unique. | 22 | // depending on the current source line to make sure variable names are unique. |
| 22 | #define INSERT_PADDING_BYTES(num_bytes) u8 CONCAT2(pad, __LINE__)[(num_bytes)] | 23 | #define INSERT_PADDING_BYTES(num_bytes) std::array<u8, num_bytes> CONCAT2(pad, __LINE__) |
| 23 | #define INSERT_PADDING_WORDS(num_words) u32 CONCAT2(pad, __LINE__)[(num_words)] | 24 | #define INSERT_PADDING_WORDS(num_words) std::array<u32, num_words> CONCAT2(pad, __LINE__) |
| 24 | 25 | ||
| 25 | // Inlining | 26 | // Inlining |
| 26 | #ifdef _WIN32 | 27 | #ifdef _WIN32 |