diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2010-05-21 18:07:01 (GMT) |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2010-05-21 18:14:05 (GMT) |
| commit | 862073a3542520ce5ff84055612fef2f994b2444 (patch) | |
| tree | 97076f4cd80a566145465960a55a6e63bcc6f236 | |
| parent | 906d5e5e985297028f0c493f7136762b3ade52b1 (diff) | |
| download | Qt-862073a3542520ce5ff84055612fef2f994b2444.zip Qt-862073a3542520ce5ff84055612fef2f994b2444.tar.gz Qt-862073a3542520ce5ff84055612fef2f994b2444.tar.bz2 | |
Fix warnings
| -rw-r--r-- | src/corelib/thread/qreadwritelock.cpp | 4 | ||||
| -rw-r--r-- | src/corelib/thread/qwaitcondition_unix.cpp | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/corelib/thread/qreadwritelock.cpp b/src/corelib/thread/qreadwritelock.cpp index bd07a97..1a9eb0b 100644 --- a/src/corelib/thread/qreadwritelock.cpp +++ b/src/corelib/thread/qreadwritelock.cpp @@ -252,7 +252,7 @@ bool QReadWriteLock::tryLockForRead(int timeout) while (d->accessCount < 0 || d->waitingWriters) { ++d->waitingReaders; - bool success = d->readerWait.wait(&d->mutex, timeout < 0 ? ULONG_MAX : timeout); + bool success = d->readerWait.wait(&d->mutex, timeout < 0 ? ULONG_MAX : ulong(timeout)); --d->waitingReaders; if (!success) return false; @@ -374,7 +374,7 @@ bool QReadWriteLock::tryLockForWrite(int timeout) while (d->accessCount != 0) { ++d->waitingWriters; - bool success = d->writerWait.wait(&d->mutex, timeout < 0 ? ULONG_MAX : timeout); + bool success = d->writerWait.wait(&d->mutex, timeout < 0 ? ULONG_MAX : ulong(timeout)); --d->waitingWriters; if (!success) diff --git a/src/corelib/thread/qwaitcondition_unix.cpp b/src/corelib/thread/qwaitcondition_unix.cpp index 4a05dd8..b371b0e 100644 --- a/src/corelib/thread/qwaitcondition_unix.cpp +++ b/src/corelib/thread/qwaitcondition_unix.cpp @@ -63,7 +63,8 @@ static void report_error(int code, const char *where, const char *what) -struct QWaitConditionPrivate { +class QWaitConditionPrivate { +public: pthread_mutex_t mutex; pthread_cond_t cond; int waiters; |