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

Q_(U)INT64_C is not a type, so don't use it as if it was 

These expressions only work because they contain no non-parenthesized
commas and an int literal is last.

Fix by wrapping only the integer literal in Q_(U)INT64_C.

Change-Id: I6b8e508b6c7c022f4b3342f65c26aab89ce17702
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
bb10
Marc Mutz 2016-07-05 15:11:43 +02:00
parent 4927fdb389
commit a91d0dd369
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/network/kernel/qauthenticator.cpp
View File

@ -1272,10 +1272,10 @@ static QByteArray qEncodeNtlmv2Response(const QAuthenticatorPrivate *ctx,
// 369 years, 89 leap years
// ((369 * 365) + 89) * 24 * 3600 = 11644473600
time = Q_UINT64_C(currentTime.toTime_t() + 11644473600);
time = currentTime.toTime_t() + Q_UINT64_C(11644473600);
// represented as 100 nano seconds
time = Q_UINT64_C(time * 10000000);
time = time * Q_UINT64_C(10000000);
ds << time;
}

8
tests/auto/corelib/tools/qringbuffer/tst_qringbuffer.cpp
View File

@ -189,9 +189,9 @@ void tst_QRingBuffer::free()
ringBuffer.append(QByteArray("01234", 5));
ringBuffer.free(1);
QCOMPARE(ringBuffer.size(), Q_INT64_C(4095 + 2048 + 5));
QCOMPARE(ringBuffer.size(), Q_INT64_C(4095) + 2048 + 5);
ringBuffer.free(4096);
QCOMPARE(ringBuffer.size(), Q_INT64_C(2047 + 5));
QCOMPARE(ringBuffer.size(), Q_INT64_C(2047) + 5);
ringBuffer.free(48);
ringBuffer.free(2000);
QCOMPARE(ringBuffer.size(), Q_INT64_C(4));
@ -251,9 +251,9 @@ void tst_QRingBuffer::chop()
ringBuffer.reserve(4096);
ringBuffer.chop(1);
QCOMPARE(ringBuffer.size(), Q_INT64_C(5 + 2048 + 4095));
QCOMPARE(ringBuffer.size(), Q_INT64_C(5) + 2048 + 4095);
ringBuffer.chop(4096);
QCOMPARE(ringBuffer.size(), Q_INT64_C(5 + 2047));
QCOMPARE(ringBuffer.size(), Q_INT64_C(5) + 2047);
ringBuffer.chop(48);
ringBuffer.chop(2000);
QCOMPARE(ringBuffer.size(), Q_INT64_C(4));