Browse Source
Revert "common_func: Use std::array for INSERT_PADDING_* macros."
pull/15/merge
bunnei
6 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with
2 additions and
3 deletions
-
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 |
|
|
|
|
