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