whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Get rid of QArrayData::isMutable() 

Change-Id: Ifb6368b83cd12ec3897c6b6b846d71bffa1f74b9
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
bb10
Lars Knoll 2019-12-03 09:46:56 +01:00
parent f8a53388a7
commit c01804bd1e
1 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/corelib/tools/qarraydata.h
View File

@ -90,17 +90,9 @@ struct Q_CORE_EXPORT QArrayData
return ref_.deref();
}
// This refers to array data mutability, not "header data" represented by
// data members in QArrayData. Shared data (array and header) must still
// follow COW principles.
bool isMutable() const
{
return ref_.loadRelaxed() != -1;
}
bool isStatic() const
{
return !isMutable();
return ref_.loadRelaxed() == -1;
}
bool isShared() const
@ -113,8 +105,7 @@ struct Q_CORE_EXPORT QArrayData
// detaching is necessary, you should be in a non-const function already
bool needsDetach()
{
// requires two conditionals
return !isMutable() || isShared();
return ref_.loadRelaxed() > 1;
}
size_t detachCapacity(size_t newSize) const