diff options
| author | Kai Koehne <kai.koehne@nokia.com> | 2012-09-12 15:30:59 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-09-13 16:46:11 +0200 |
| commit | edfdaba696d94206794203f9621d7e3aa8e5ab26 (patch) | |
| tree | 2d3808b537a0fbb80919101502ffa22b1060e8fc /src | |
| parent | bb22f7cb84639c641c3d1a6bceaf8a303af09ce7 (diff) | |
Threads: Fix mingw-gcc warning about 'cast to pointer from integer of different size'
Use reinterpret_cast to convert from DWORD to pointer.
Change-Id: I17a12940850aeb0bc27080725a18eb93fee72ff7
Reviewed-by: Qt Doc Bot <qt_docbot@qt-project.org>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/thread/qthread_win.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/corelib/thread/qthread_win.cpp b/src/corelib/thread/qthread_win.cpp index 3566cace61..599e10011d 100644 --- a/src/corelib/thread/qthread_win.cpp +++ b/src/corelib/thread/qthread_win.cpp @@ -115,7 +115,7 @@ QThreadData *QThreadData::current() } threadData->deref(); threadData->isAdopted = true; - threadData->threadId = (Qt::HANDLE)GetCurrentThreadId(); + threadData->threadId = reinterpret_cast<Qt::HANDLE>(GetCurrentThreadId()); if (!QCoreApplicationPrivate::theMainThread) { QCoreApplicationPrivate::theMainThread = threadData->thread; @@ -130,7 +130,7 @@ QThreadData *QThreadData::current() FALSE, DUPLICATE_SAME_ACCESS); #else - realHandle = (HANDLE)GetCurrentThreadId(); + realHandle = reinterpret_cast<HANDLE>(GetCurrentThreadId()); #endif qt_watch_adopted_thread(realHandle, threadData->thread); } @@ -314,7 +314,7 @@ unsigned int __stdcall QT_ENSURE_STACK_ALIGNED_FOR_SSE QThreadPrivate::start(voi qt_create_tls(); TlsSetValue(qt_current_thread_data_tls_index, data); - data->threadId = (Qt::HANDLE)GetCurrentThreadId(); + data->threadId = reinterpret_cast<Qt::HANDLE>(GetCurrentThreadId()); QThread::setTerminationEnabled(false); @@ -392,7 +392,7 @@ void QThreadPrivate::finish(void *arg, bool lockAnyway) Qt::HANDLE QThread::currentThreadId() Q_DECL_NOTHROW { - return (Qt::HANDLE)GetCurrentThreadId(); + return reinterpret_cast<Qt::HANDLE>(GetCurrentThreadId()); } int QThread::idealThreadCount() Q_DECL_NOTHROW |