Skip to content

Commit 22b158b

Browse files
committed
Define value first in BitFieldMember and BitFieldArray, to make sure they fit the definition of "standard-layout class" in section 9.0.7.6.
1 parent c385015 commit 22b158b

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

common/bitfield.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717
template <typename T, int Offset, int Bits>
1818
struct BitFieldMember
1919
{
20+
T value;
21+
2022
static_assert(Offset + Bits <= (int) sizeof(T) * 8, "Member exceeds bitfield boundaries");
2123
static_assert(Bits < (int) sizeof(T) * 8, "Can't fill entire bitfield with one member");
2224

@@ -25,8 +27,6 @@ struct BitFieldMember
2527
T maximum() const { return Maximum; }
2628
T one() const { return T(1) << Offset; }
2729

28-
T value;
29-
3030
operator T() const
3131
{
3232
return (value >> Offset) & Maximum;
@@ -68,15 +68,15 @@ struct BitFieldMember
6868
template <typename T, int BaseOffset, int BitsPerItem, int NumItems>
6969
struct BitFieldArray
7070
{
71+
T value;
72+
7173
static_assert(BaseOffset + BitsPerItem * NumItems <= (int) sizeof(T) * 8, "Array exceeds bitfield boundaries");
7274
static_assert(BitsPerItem < (int) sizeof(T) * 8, "Can't fill entire bitfield with one array element");
7375

7476
static const T Maximum = (T(1) << BitsPerItem) - 1;
7577
T maximum() const { return Maximum; }
7678
int numItems() const { return NumItems; }
7779

78-
T value;
79-
8080
class Element
8181
{
8282
private:

0 commit comments

Comments
 (0)