diff options
| author | bunnei <bunneidev@gmail.com> | 2019-11-03 10:39:51 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-03 10:39:51 +0100 |
| commit | 4edf73344f060706d316b9f43d9249ef604a6ea9 (patch) | |
| tree | 71c2d63fa0ea63aa29033102ace5a2b91d15ed79 /src/common/common_funcs.h | |
| parent | Merge pull request #3063 from bunnei/zero-init-padding (diff) | |
| download | yuzu-4edf73344f060706d316b9f43d9249ef604a6ea9.tar yuzu-4edf73344f060706d316b9f43d9249ef604a6ea9.tar.gz yuzu-4edf73344f060706d316b9f43d9249ef604a6ea9.tar.bz2 yuzu-4edf73344f060706d316b9f43d9249ef604a6ea9.tar.lz yuzu-4edf73344f060706d316b9f43d9249ef604a6ea9.tar.xz yuzu-4edf73344f060706d316b9f43d9249ef604a6ea9.tar.zst yuzu-4edf73344f060706d316b9f43d9249ef604a6ea9.zip | |
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 @@ #pragma once #include <algorithm> -#include <array> #include <string> #if !defined(ARCHITECTURE_x86_64) @@ -20,8 +19,8 @@ // helper macro to properly align structure members. // Calling INSERT_PADDING_BYTES will add a new member variable with a name like "pad121", // depending on the current source line to make sure variable names are unique. -#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) u8 CONCAT2(pad, __LINE__)[(num_bytes)] +#define INSERT_PADDING_WORDS(num_words) u32 CONCAT2(pad, __LINE__)[(num_words)] // Inlining #ifdef _WIN32 |