1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix compilation of QContiguousCache::operator=

Browse Source 
freeData() takes a Data*, not a QContiguousCacheData*.

Task-number: QTBUG-45783
Change-Id: I96d7ac38dac24b418138ffff13d7fdf09b1d6b07
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
This commit is contained in:
Thiago Macieira 2015-04-24 08:50:16 -07:00 committed by Marc Mutz
parent 9a1283f8d3
commit 9269dcc8ed
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/corelib/tools/qcontiguouscache.h
View File

@ -291,7 +291,7 @@ QContiguousCache<T> &QContiguousCache<T>::operator=(const QContiguousCache<T> &o
{ {
other.d->ref.ref(); other.d->ref.ref();
if (!d->ref.deref()) if (!d->ref.deref())
freeData(d); freeData(p);
d = other.d; d = other.d;
if (!d->sharable) if (!d->sharable)
detach_helper(); detach_helper();

12
tests/auto/corelib/tools/qcontiguouscache/tst_qcontiguouscache.cpp
View File

@ -43,6 +43,8 @@ class tst_QContiguousCache : public QObject
{ {
Q_OBJECT Q_OBJECT
private slots: private slots:
void assignment();
void empty(); void empty();
void swap(); void swap();
@ -64,6 +66,16 @@ private slots:
QTEST_MAIN(tst_QContiguousCache) QTEST_MAIN(tst_QContiguousCache)
void tst_QContiguousCache::assignment()
{
// compile-only test: QTBUG-45783
QContiguousCache<int> cc1, cc2;
// copy:
cc1 = cc2;
// move:
cc1 = qMove(cc2);
}
void tst_QContiguousCache::empty() void tst_QContiguousCache::empty()
{ {
QContiguousCache<int> c(10); QContiguousCache<int> c(10);