Merge pull request #3064 from yuzu-emu/revert-3063-zero-init-padding
Revert "common_func: Use std::array for INSERT_PADDING_* macros."
This commit is contained in:
commit
84887b0088
|
@ -5,7 +5,6 @@
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
#include <array>
|
|
||||||
#include <string>
|
#include <string>
|
||||||
|
|
||||||
#if !defined(ARCHITECTURE_x86_64)
|
#if !defined(ARCHITECTURE_x86_64)
|
||||||
|
@ -20,8 +19,8 @@
|
||||||
// helper macro to properly align structure members.
|
// helper macro to properly align structure members.
|
||||||
// Calling INSERT_PADDING_BYTES will add a new member variable with a name like "pad121",
|
// 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.
|
// 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_BYTES(num_bytes) u8 CONCAT2(pad, __LINE__)[(num_bytes)]
|
||||||
#define INSERT_PADDING_WORDS(num_words) std::array<u32, num_words> CONCAT2(pad, __LINE__)
|
#define INSERT_PADDING_WORDS(num_words) u32 CONCAT2(pad, __LINE__)[(num_words)]
|
||||||
|
|
||||||
// Inlining
|
// Inlining
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
|
|
Reference in New Issue