Skip to content

Commit 9569066

Browse files
psychonicCopilot
andauthored
Upgrade Clang to v22 (#2451)
* Upgrade Clang to v22 Co-authored-by: Copilot <copilot@github.com> * Compatibility fixes for Clang 22 --------- Co-authored-by: Copilot <copilot@github.com>
1 parent c6038c7 commit 9569066

7 files changed

Lines changed: 10 additions & 10 deletions

File tree

.github/workflows/build-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
- platform: linux
2525
os: ubuntu-latest
2626
os_short: linux
27-
container_image: ghcr.io/alliedmodders/build-containers/debian11:latest
27+
container_image: ghcr.io/alliedmodders/build-containers/debian11-clang22:latest
2828
fail-fast: false
2929
name: ${{ matrix.platform }}
3030
runs-on: ${{ matrix.os }}

.github/workflows/pr-checks.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
- platform: linux
2121
os: ubuntu-latest
2222
os_short: linux
23-
container_image: ghcr.io/alliedmodders/build-containers/debian11:latest
23+
container_image: ghcr.io/alliedmodders/build-containers/debian11-clang22:latest
2424
fail-fast: false
2525
runs-on: ${{ matrix.os }}
2626
container:

core/logic/HandleSys.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ HandleSystem::HandleSystem()
7070
memset(m_Handles, 0, sizeof(QHandle) * (HANDLESYS_MAX_HANDLES + 1));
7171

7272
m_Types = new QHandleType[HANDLESYS_TYPEARRAY_SIZE];
73-
memset(m_Types, 0, sizeof(QHandleType) * HANDLESYS_TYPEARRAY_SIZE);
73+
memset((void *)m_Types, 0, sizeof(QHandleType) * HANDLESYS_TYPEARRAY_SIZE);
7474

7575
m_TypeTail = 0;
7676
}

extensions/dhooks/DynamicHooks/conventions/x86MsCdecl.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ void x86MsCdecl::ReturnPtrChanged(CRegisters* pRegisters, void* pReturnPtr)
181181
if (m_pReturnBuffer)
182182
{
183183
// First half in eax, second half in edx
184-
memcpy(pRegisters->m_eax, m_pReturnBuffer, 4);
185-
memcpy(pRegisters->m_edx, (void *) ((unsigned long) m_pReturnBuffer + 4), 4);
184+
memcpy((void *)pRegisters->m_eax, m_pReturnBuffer, 4);
185+
memcpy((void *)pRegisters->m_edx, (void *) ((unsigned long) m_pReturnBuffer + 4), 4);
186186
}
187187
}

extensions/dhooks/DynamicHooks/conventions/x86MsStdcall.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ void x86MsStdcall::ReturnPtrChanged(CRegisters* pRegisters, void* pReturnPtr)
188188
if (m_pReturnBuffer)
189189
{
190190
// First half in eax, second half in edx
191-
memcpy(pRegisters->m_eax, m_pReturnBuffer, 4);
192-
memcpy(pRegisters->m_edx, (void *) ((unsigned long) m_pReturnBuffer + 4), 4);
191+
memcpy((void *)pRegisters->m_eax, m_pReturnBuffer, 4);
192+
memcpy((void *)pRegisters->m_edx, (void *) ((unsigned long) m_pReturnBuffer + 4), 4);
193193
}
194194
}

extensions/dhooks/DynamicHooks/conventions/x86MsThiscall.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -203,8 +203,8 @@ void x86MsThiscall::ReturnPtrChanged(CRegisters* pRegisters, void* pReturnPtr)
203203
if (m_pReturnBuffer)
204204
{
205205
// First half in eax, second half in edx
206-
memcpy(pRegisters->m_eax, m_pReturnBuffer, 4);
207-
memcpy(pRegisters->m_edx, (void *) ((unsigned long) m_pReturnBuffer + 4), 4);
206+
memcpy((void *)pRegisters->m_eax, m_pReturnBuffer, 4);
207+
memcpy((void *)pRegisters->m_edx, (void *) ((unsigned long) m_pReturnBuffer + 4), 4);
208208
}
209209
}
210210

extensions/sdktools/variant-t.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ extern sp_nativeinfo_t g_VariantTNatives[];
4747

4848
inline void _init_variant_t()
4949
{
50-
memset(&g_Variant_t, 0, sizeof(g_Variant_t));
50+
memset((void *)&g_Variant_t, 0, sizeof(g_Variant_t));
5151
}
5252

5353
#endif //_INCLUDE_SOURCEMOD_EXTENSION_VARIANT_T_H_

0 commit comments

Comments
 (0)