diff options
| author | Lars Schmertmann <Lars.Schmertmann@governikus.de> | 2020-06-26 14:43:02 +0200 |
|---|---|---|
| committer | Lars Schmertmann <Lars.Schmertmann@governikus.de> | 2020-06-26 19:18:03 +0200 |
| commit | e79281533d61dda90d1c5995345a66e6089c7501 (patch) | |
| tree | 5033642cb0ae1d76aa0fc0525e153c04eefc921d /src/3rdparty | |
| parent | 6d8aca544ccb1e2624a679e2d65622461f643291 (diff) | |
Add ; to Q_UNUSED and UNUSED_PARAM
This is required to remove the ; from the macro with Qt 6.
Task-number: QTBUG-82978
Change-Id: Iead53d18fd790fb2d870d80ef2db79666f0d2392
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Diffstat (limited to 'src/3rdparty')
| -rw-r--r-- | src/3rdparty/masm/assembler/LinkBuffer.h | 10 | ||||
| -rw-r--r-- | src/3rdparty/masm/assembler/MacroAssemblerARM64.h | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/3rdparty/masm/assembler/LinkBuffer.h b/src/3rdparty/masm/assembler/LinkBuffer.h index ba57564a1d..ba5a98733e 100644 --- a/src/3rdparty/masm/assembler/LinkBuffer.h +++ b/src/3rdparty/masm/assembler/LinkBuffer.h @@ -93,7 +93,7 @@ public: #endif { #ifdef NDEBUG - UNUSED_PARAM(effort) + UNUSED_PARAM(effort); #endif // Simon: Moved this to the sub-classes linkCode(ownerUID, effort); } @@ -327,8 +327,8 @@ inline typename LinkBufferBase<MacroAssembler, ExecutableOffsetCalculator>::Code template <typename MacroAssembler, template <typename T> class ExecutableOffsetCalculator> inline void LinkBufferBase<MacroAssembler, ExecutableOffsetCalculator>::linkCode(void* ownerUID, JITCompilationEffort effort) { - UNUSED_PARAM(ownerUID) - UNUSED_PARAM(effort) + UNUSED_PARAM(ownerUID); + UNUSED_PARAM(effort); ASSERT(!m_code); m_executableMemory = m_assembler->m_assembler.executableCopy(*m_globalData, ownerUID, effort); if (!m_executableMemory) @@ -435,8 +435,8 @@ inline void BranchCompactingLinkBuffer<MacroAssembler>::makeExecutable() template <typename MacroAssembler> inline void BranchCompactingLinkBuffer<MacroAssembler>::linkCode(void* ownerUID, JITCompilationEffort effort) { - UNUSED_PARAM(ownerUID) - UNUSED_PARAM(effort) + UNUSED_PARAM(ownerUID); + UNUSED_PARAM(effort); ASSERT(!m_code); m_initialSize = m_assembler->m_assembler.codeSize(); m_executableMemory = m_globalData->executableAllocator.allocate(*m_globalData, m_initialSize, ownerUID, effort); diff --git a/src/3rdparty/masm/assembler/MacroAssemblerARM64.h b/src/3rdparty/masm/assembler/MacroAssemblerARM64.h index c0c68f6393..c131cdfcae 100644 --- a/src/3rdparty/masm/assembler/MacroAssemblerARM64.h +++ b/src/3rdparty/masm/assembler/MacroAssemblerARM64.h @@ -3224,7 +3224,7 @@ private: { #if 1 Q_UNUSED(immediate); - Q_UNUSED(dest) + Q_UNUSED(dest); #else intptr_t currentRegisterContents; if (dest.value(currentRegisterContents)) { |