diff options
| author | Marc Mutz <marc.mutz@qt.io> | 2022-07-06 10:05:49 +0200 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@qt.io> | 2022-07-06 16:00:52 +0200 |
| commit | c4bddc4765c9c21da1e69ecc3ed4b7897bf14e41 (patch) | |
| tree | b949c0cf531fbe8a184a6eef1befb483f8205732 /src/3rdparty/masm/assembler | |
| parent | b3a39ab75eb29a9c069095b5bbc0868b72582823 (diff) | |
masm: fix -Wdeprecated-enum-enum-conversion
C++20 deprecated mixed-enum arithmetic.
Cast one of the enums to int to suppress the warning.
Pick-to: 6.4 6.3 6.2 5.15
Fixes: QTBUG-103943
Change-Id: I157be3368d6a0f201f3f4ddd7248479ee544d32d
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Diffstat (limited to 'src/3rdparty/masm/assembler')
| -rw-r--r-- | src/3rdparty/masm/assembler/X86Assembler.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/3rdparty/masm/assembler/X86Assembler.h b/src/3rdparty/masm/assembler/X86Assembler.h index 07a883397a..ab80e42e79 100644 --- a/src/3rdparty/masm/assembler/X86Assembler.h +++ b/src/3rdparty/masm/assembler/X86Assembler.h @@ -202,12 +202,12 @@ private: TwoByteOpcodeID jccRel32(Condition cond) { - return (TwoByteOpcodeID)(OP2_JCC_rel32 + cond); + return (TwoByteOpcodeID)(int(OP2_JCC_rel32) + cond); } TwoByteOpcodeID setccOpcode(Condition cond) { - return (TwoByteOpcodeID)(OP_SETCC + cond); + return (TwoByteOpcodeID)(int(OP_SETCC) + cond); } typedef enum { |