Shut msvc

alliedmodders · Feb 8, 2024 · 3740821 · 3740821
1 parent f950db7
commit 3740821
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/core/sourcehook/generate/sourcehook.hxx b/core/sourcehook/generate/sourcehook.hxx
@@ -907,7 +907,10 @@ SourceHook::CallClass<T> *SH_GET_CALLCLASS(T *p)
 		/* patch mfp */ \
 		*reinterpret_cast<void**>(&mfp) = *reinterpret_cast<void**>(vfnptr); \
 		if (sizeof(mfp) == 2*sizeof(void*)) /* gcc */ \
-			*(reinterpret_cast<void**>(&mfp) + 1) = 0; \
+		{ \
+			void** pleaseShutUpMsvc = reinterpret_cast<void**>(&mfp); \
+			pleaseShutUpMsvc[1] = 0; \
+		} \
 		return SH_MFHCls(hookname)::CallEC(reinterpret_cast< ::SourceHook::EmptyClass* >(ptr), mfp, vfnptr, SH_GLOB_SHPTR); \
 	} \
 	void __SourceHook_FHM_Reconfigure##hookname(int p_vtblindex, int p_vtbloffs, int p_thisptroffs) \

diff --git a/core/sourcehook/sourcehook.h b/core/sourcehook/sourcehook.h
@@ -907,7 +907,10 @@ SourceHook::CallClass<T> *SH_GET_CALLCLASS(T *p)
 		/* patch mfp */ \
 		*reinterpret_cast<void**>(&mfp) = *reinterpret_cast<void**>(vfnptr); \
 		if (sizeof(mfp) == 2*sizeof(void*)) /* gcc */ \
-			*(reinterpret_cast<void**>(&mfp) + 1) = 0; \
+		{ \
+			void** pleaseShutUpMsvc = reinterpret_cast<void**>(&mfp); \
+			pleaseShutUpMsvc[1] = 0; \
+		} \
 		return SH_MFHCls(hookname)::CallEC(reinterpret_cast< ::SourceHook::EmptyClass* >(ptr), mfp, vfnptr, SH_GLOB_SHPTR); \
 	} \
 	void __SourceHook_FHM_Reconfigure##hookname(int p_vtblindex, int p_vtbloffs, int p_thisptroffs) \