summaryrefslogtreecommitdiffstats
path: root/src/corelib/thread
diff options
context:
space:
mode:
Diffstat (limited to 'src/corelib/thread')
-rw-r--r--src/corelib/thread/qthread_win.cpp6
-rw-r--r--src/corelib/thread/qthreadstorage.cpp8
2 files changed, 7 insertions, 7 deletions
diff --git a/src/corelib/thread/qthread_win.cpp b/src/corelib/thread/qthread_win.cpp
index 78c4d8d672..ffd476d6d3 100644
--- a/src/corelib/thread/qthread_win.cpp
+++ b/src/corelib/thread/qthread_win.cpp
@@ -135,8 +135,8 @@ void QAdoptedThread::init()
d_func()->id = GetCurrentThreadId();
}
-static QVector<HANDLE> qt_adopted_thread_handles;
-static QVector<QThread *> qt_adopted_qthreads;
+static QList<HANDLE> qt_adopted_thread_handles;
+static QList<QThread *> qt_adopted_qthreads;
static QBasicMutex qt_adopted_thread_watcher_mutex;
static DWORD qt_adopted_thread_watcher_id = 0;
static HANDLE qt_adopted_thread_wakeup = 0;
@@ -188,7 +188,7 @@ DWORD WINAPI qt_adopted_thread_watcher_function(LPVOID)
break;
}
- QVector<HANDLE> handlesCopy = qt_adopted_thread_handles;
+ QList<HANDLE> handlesCopy = qt_adopted_thread_handles;
qt_adopted_thread_watcher_mutex.unlock();
DWORD ret = WAIT_TIMEOUT;
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<void (*)(void *)> DestructorMap;
+typedef QList<void (*)(void *)> 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<void *> &tls = data->tls;
+ QList<void *> &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<void *> &tls = data->tls;
+ QList<void *> &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<void *> *tls = reinterpret_cast<QVector<void *> *>(p);
+ QList<void *> *tls = reinterpret_cast<QList<void *> *>(p);
if (!tls || tls->isEmpty() || !destructors())
return; // nothing to do