Merge remote-tracking branch 'origin/master' into devel/c++-contracts

[thirdparty/gcc.git] / gcc / d / dmd / aggregate.h

diff --git a/gcc/d/dmd/aggregate.h b/gcc/d/dmd/aggregate.h
index f0909e3dc02aaf0ffbe8fc67cdade7d3b4e6f39a..d4432b513c4dd1943f0e739d32aabcbbfe23583b 100644 (file)
--- a/gcc/d/dmd/aggregate.h
+++ b/gcc/d/dmd/aggregate.h
@@ -82,7 +82,7 @@ public:
     CPPMANGLE cppmangle;
 
     // overridden symbol with pragma(mangle, "...")
-    MangleOverride *mangleOverride;
+    MangleOverride *pMangleOverride;
     /* !=NULL if is nested
      * pointing to the dsymbol that directly enclosing it.
      * 1. The function that enclosing it (nested struct and class)
@@ -174,7 +174,7 @@ public:
     structalign_t alignment;    // alignment applied outside of the struct
     ThreeState ispod;           // if struct is POD
 private:
-    uint8_t bitFields;
+    uint16_t bitFields;
 public:
     static StructDeclaration *create(const Loc &loc, Identifier *id, bool inObject);
     StructDeclaration *syntaxCopy(Dsymbol *s) override;