diff options
| author | Marc Mutz <marc.mutz@qt.io> | 2023-03-20 12:33:02 +0100 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@qt.io> | 2023-06-12 13:11:26 +0000 |
| commit | b209f943d2611fa4ac2dd9c64b1a014182b59a3d (patch) | |
| tree | 744bb5708a5a52438aef7cba1ffb96d5c3a051eb /src/corelib/tools/qarraydata.cpp | |
| parent | e86e2752845ede635840851198c334f550fafb8f (diff) | |
Replace {add,sub,mul}_overload with q{Add,Sub,Mul}Overload
These APIs started out as private APIs in qnumeric_p.h, but have since
been made pseudo-public in qnumeric.h. The qnumeric_p.h versions just
forward to the qnumeric.h ones, so just use the latter.
This is in preparation of removing the {add,sub,mul}_overflow
versions, which, despite being defined in the unnamed namespace, don't
sport the q prefix, so potentially clash with global symbols.
The change is a simple textual search and replace, manually excluding
qnumeric_p.h.
Picking to 6.5 to avoid cherry-pick conflicts going forward.
Pick-to: 6.6 6.5
Change-Id: Ic0f7c92f7c47923317109e8a9dc06fa66bdff2c2
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Diffstat (limited to 'src/corelib/tools/qarraydata.cpp')
| -rw-r--r-- | src/corelib/tools/qarraydata.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/corelib/tools/qarraydata.cpp b/src/corelib/tools/qarraydata.cpp index b1634d61b52..433385ade39 100644 --- a/src/corelib/tools/qarraydata.cpp +++ b/src/corelib/tools/qarraydata.cpp @@ -54,8 +54,8 @@ qsizetype qCalculateBlockSize(qsizetype elementCount, qsizetype elementSize, qsi Q_ASSERT(elementSize); size_t bytes; - if (Q_UNLIKELY(mul_overflow(size_t(elementSize), size_t(elementCount), &bytes)) || - Q_UNLIKELY(add_overflow(bytes, size_t(headerSize), &bytes))) + if (Q_UNLIKELY(qMulOverflow(size_t(elementSize), size_t(elementCount), &bytes)) || + Q_UNLIKELY(qAddOverflow(bytes, size_t(headerSize), &bytes))) return -1; if (Q_UNLIKELY(qsizetype(bytes) < 0)) return -1; @@ -118,7 +118,7 @@ static inline qsizetype reserveExtraBytes(qsizetype allocSize) constexpr qsizetype extra = qMax(sizeof(QByteArray::value_type), sizeof(QString::value_type)); if (Q_UNLIKELY(allocSize < 0)) return -1; - if (Q_UNLIKELY(add_overflow(allocSize, extra, &allocSize))) + if (Q_UNLIKELY(qAddOverflow(allocSize, extra, &allocSize))) return -1; return allocSize; } |