Replace QArrayData::capacityReserved with a full flags field

Instead of stealing one bit from the alloc field, let's use a full
32-bit for the flags. The first flag to be in the field is the
CapacityReserved (even though the allocate() function will store some
others there, not relevant for now).

This is done in preparation for the need for more flags necessary
anyway.

Change-Id: I4c997d14743495e0d4558a6fb0a6042eb3d4975d
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>

1 files changed, 2 insertions, 2 deletions

diff --git a/src/corelib/tools/qarraydata.cpp b/src/corelib/tools/qarraydata.cpp
index 592faf39c3..ce6f138497 100644
--- a/src/corelib/tools/qarraydata.cpp
+++ b/src/corelib/tools/qarraydata.cpp
@@ -183,7 +183,7 @@ static QArrayData *reallocateData(QArrayData *header, size_t allocSize, uint opt
 {
     header = static_cast<QArrayData *>(::realloc(header, allocSize));
     if (header)
-        header->capacityReserved = bool(options & QArrayData::CapacityReserved);
+        header->flags = options;
     return header;
 }
 
@@ -219,7 +219,7 @@ QArrayData *QArrayData::allocate(size_t objectSize, size_t alignment,
         header->ref.atomic.storeRelaxed(1);
         header->size = 0;
         header->alloc = capacity;
-        header->capacityReserved = bool(options & CapacityReserved);
+        header->flags = options;
         header->offset = data - quintptr(header);
     }