diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-03-04 15:42:39 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-03-04 16:31:13 +0100 |
| commit | 09f32728142b96fef4c7000fd757f0f18cbfaafe (patch) | |
| tree | ac84a9a1faa36b67d873a451ef5b885f05b0c42b /src/corelib/tools/qversionnumber.h | |
| parent | 649d7abcd2eb27d239497a2d8152c5e542df9657 (diff) | |
QTypeRevision: Fix warnings about max macro from windows.h
Similar to def272750cdb7810bca4f4815ed1183ba2bd6df9, put parentheses
around std::numeric_limits<Integer>::max, fixing:
qversionnumber.h(339): warning C4003: not enough arguments for function-like macro invocation 'max'
Change-Id: Id574f3a08973cf1408e015f155c8e658b04bd170
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Diffstat (limited to 'src/corelib/tools/qversionnumber.h')
| -rw-r--r-- | src/corelib/tools/qversionnumber.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/corelib/tools/qversionnumber.h b/src/corelib/tools/qversionnumber.h index 2f886346c9..f31cdc92a6 100644 --- a/src/corelib/tools/qversionnumber.h +++ b/src/corelib/tools/qversionnumber.h @@ -335,8 +335,9 @@ public: template<typename Integer, if_valid_segment_type<Integer> = true> static constexpr bool isValidSegment(Integer segment) { + // using extra parentheses around max to avoid expanding it if it is a macro return segment >= Integer(0) - && (std::numeric_limits<Integer>::max() < Integer(SegmentUnknown) + && ((std::numeric_limits<Integer>::max)() < Integer(SegmentUnknown) || segment < Integer(SegmentUnknown)); } |