summaryrefslogtreecommitdiffstats
path: root/src/common/common_funcs.h
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2019-11-03 09:55:06 +0100
committerbunnei <bunneidev@gmail.com>2019-11-03 10:30:16 +0100
commitfdc5791b08092a86ea9b70bb9bc5e0f8d9f869f0 (patch)
tree3bb476f82e612e42997e72d423a7bf3586de2248 /src/common/common_funcs.h
parentMerge pull request #3058 from FearlessTobi/port-4948 (diff)
downloadyuzu-fdc5791b08092a86ea9b70bb9bc5e0f8d9f869f0.tar
yuzu-fdc5791b08092a86ea9b70bb9bc5e0f8d9f869f0.tar.gz
yuzu-fdc5791b08092a86ea9b70bb9bc5e0f8d9f869f0.tar.bz2
yuzu-fdc5791b08092a86ea9b70bb9bc5e0f8d9f869f0.tar.lz
yuzu-fdc5791b08092a86ea9b70bb9bc5e0f8d9f869f0.tar.xz
yuzu-fdc5791b08092a86ea9b70bb9bc5e0f8d9f869f0.tar.zst
yuzu-fdc5791b08092a86ea9b70bb9bc5e0f8d9f869f0.zip
Diffstat (limited to 'src/common/common_funcs.h')
-rw-r--r--src/common/common_funcs.h5
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 @@
#pragma once
#include <algorithm>
+#include <array>
#include <string>
#if !defined(ARCHITECTURE_x86_64)
@@ -19,8 +20,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) u8 CONCAT2(pad, __LINE__)[(num_bytes)]
-#define INSERT_PADDING_WORDS(num_words) u32 CONCAT2(pad, __LINE__)[(num_words)]
+#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__)
// Inlining
#ifdef _WIN32