From b0f9c06a9b199a7474eb94a6292b5824364344b6 Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Fri, 26 Jun 2020 08:21:15 +0200 Subject: Use QList instead of QVector in corelib implementation Omitting state machine and docs for now. Task-number: QTBUG-84469 Change-Id: Ibfa5e7035515773461f6cdbff35299315ef65737 Reviewed-by: Sona Kurazyan --- src/corelib/thread/qthreadstorage.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/corelib/thread/qthreadstorage.cpp') diff --git a/src/corelib/thread/qthreadstorage.cpp b/src/corelib/thread/qthreadstorage.cpp index 464559ffa5..9c9a63d29b 100644 --- a/src/corelib/thread/qthreadstorage.cpp +++ b/src/corelib/thread/qthreadstorage.cpp @@ -69,7 +69,7 @@ void qtsDebug(const char *fmt, ...) #endif static QBasicMutex destructorsMutex; -typedef QVector DestructorMap; +typedef QList DestructorMap; Q_GLOBAL_STATIC(DestructorMap, destructors) QThreadStorageData::QThreadStorageData(void (*func)(void *)) @@ -118,7 +118,7 @@ void **QThreadStorageData::get() const qWarning("QThreadStorage::get: QThreadStorage can only be used with threads started with QThread"); return nullptr; } - QVector &tls = data->tls; + QList &tls = data->tls; if (tls.size() <= id) tls.resize(id + 1); void **v = &tls[id]; @@ -138,7 +138,7 @@ void **QThreadStorageData::set(void *p) qWarning("QThreadStorage::set: QThreadStorage can only be used with threads started with QThread"); return nullptr; } - QVector &tls = data->tls; + QList &tls = data->tls; if (tls.size() <= id) tls.resize(id + 1); @@ -170,7 +170,7 @@ void **QThreadStorageData::set(void *p) void QThreadStorageData::finish(void **p) { - QVector *tls = reinterpret_cast *>(p); + QList *tls = reinterpret_cast *>(p); if (!tls || tls->isEmpty() || !destructors()) return; // nothing to do -- cgit v1.2.3