diff options
| author | Alexander Neumann <neumann@imt.uni-luebeck.de> | 2021-09-29 12:47:59 +0200 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2021-10-11 14:01:56 +0000 |
| commit | a4e9ea7a1faea5e6cdb82ddda32450df71232c90 (patch) | |
| tree | 15970d35629c9b6804f3714b1a8bb46de8d26324 /src/corelib/thread | |
| parent | 9d26de4069b9899788212ab4314c3e13dd65e223 (diff) | |
avoid max macro expansion on windows if NOMINMAX is missing
Pick-to: 6.2
Change-Id: I1c19da59bdf97a434be52239c2a5b1b517341bcb
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/thread')
| -rw-r--r-- | src/corelib/thread/qthread.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/thread/qthread.h b/src/corelib/thread/qthread.h index e48354dedb..89b4a0776c 100644 --- a/src/corelib/thread/qthread.h +++ b/src/corelib/thread/qthread.h @@ -120,7 +120,7 @@ public: bool wait(QDeadlineTimer deadline = QDeadlineTimer(QDeadlineTimer::Forever)); bool wait(unsigned long time) { - if (time == std::numeric_limits<unsigned long>::max()) + if (time == (std::numeric_limits<unsigned long>::max)()) return wait(QDeadlineTimer(QDeadlineTimer::Forever)); return wait(QDeadlineTimer(time)); } |