Browse Source

Merge pull request #3113 from lioncash/semi

common_funcs: Remove semicolons from INSERT_PADDING_* macros
nce_cpp
Rodrigo Locatti 6 years ago
committed by GitHub
parent
commit
f24bc2e049
  1. 10
      src/common/common_funcs.h

10
src/common/common_funcs.h

@ -19,13 +19,15 @@
/// Helper macros to insert unused bytes or words to properly align structs. These values will be /// Helper macros to insert unused bytes or words to properly align structs. These values will be
/// zero-initialized. /// zero-initialized.
#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) \
std::array<u8, num_bytes> CONCAT2(pad, __LINE__) {}
#define INSERT_PADDING_WORDS(num_words) \
std::array<u32, num_words> CONCAT2(pad, __LINE__) {}
/// These are similar to the INSERT_PADDING_* macros, but are needed for padding unions. This is /// These are similar to the INSERT_PADDING_* macros, but are needed for padding unions. This is
/// because unions can only be initialized by one member. /// because unions can only be initialized by one member.
#define INSERT_UNION_PADDING_BYTES(num_bytes) std::array<u8, num_bytes> CONCAT2(pad, __LINE__);
#define INSERT_UNION_PADDING_WORDS(num_words) std::array<u32, num_words> CONCAT2(pad, __LINE__);
#define INSERT_UNION_PADDING_BYTES(num_bytes) std::array<u8, num_bytes> CONCAT2(pad, __LINE__)
#define INSERT_UNION_PADDING_WORDS(num_words) std::array<u32, num_words> CONCAT2(pad, __LINE__)
#ifndef _MSC_VER #ifndef _MSC_VER

Loading…
Cancel
Save