diff options
author | dimitri <dimitri@afe2bf4a-e733-0410-8a33-86f594647bc7> | 2011-08-14 13:56:38 (GMT) |
---|---|---|
committer | dimitri <dimitri@afe2bf4a-e733-0410-8a33-86f594647bc7> | 2011-08-14 13:56:38 (GMT) |
commit | 9e5aed6d58f0e33ca942f67daa49971d885b0110 (patch) | |
tree | 3138a0d18d53a00498b4cad59f934a4e64762cf8 /qtools | |
parent | 3426c85df5daa8d679bc2ed87740ccbc34d6346b (diff) | |
download | Doxygen-9e5aed6d58f0e33ca942f67daa49971d885b0110.zip Doxygen-9e5aed6d58f0e33ca942f67daa49971d885b0110.tar.gz Doxygen-9e5aed6d58f0e33ca942f67daa49971d885b0110.tar.bz2 |
Release-1.7.5
Diffstat (limited to 'qtools')
-rw-r--r-- | qtools/Doxyfile | 2 | ||||
-rw-r--r-- | qtools/qmutex.cpp | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/qtools/Doxyfile b/qtools/Doxyfile index f7b815e..8600643 100644 --- a/qtools/Doxyfile +++ b/qtools/Doxyfile @@ -212,7 +212,7 @@ MAN_LINKS = NO #--------------------------------------------------------------------------- # configuration options related to the XML output #--------------------------------------------------------------------------- -GENERATE_XML = NO +GENERATE_XML = YES XML_OUTPUT = xml XML_SCHEMA = XML_DTD = diff --git a/qtools/qmutex.cpp b/qtools/qmutex.cpp index fda5f07..08a13bc 100644 --- a/qtools/qmutex.cpp +++ b/qtools/qmutex.cpp @@ -59,7 +59,7 @@ void QMutex::lock() { //printf("%p: QMutex::lock(): enter\n",this); bool isLocked; - isLocked = d->contenders == 0 && d->contenders.testAndSet(0, 1); + isLocked = d->contenders.testAndSet(0, 1); if (!isLocked) { isLocked = d->contenders.fetchAndAdd(1)==0; @@ -78,8 +78,7 @@ void QMutex::lock() bool QMutex::tryLock() { - bool isLocked = d->contenders == 0 && - d->contenders.testAndSet(0, 1); + bool isLocked = d->contenders.testAndSet(0, 1); return isLocked; } |