fix gcc 12.1 compilation

alliedmodders · Jul 10, 2022 · 475b1cd · 475b1cd
1 parent e5c519c
commit 475b1cd
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 23 deletions.
diff --git a/modules/cstrike/csx/CMisc.cpp b/modules/cstrike/csx/CMisc.cpp
@@ -127,10 +127,10 @@ void CPlayer::Connect(const char* address ){
 
 void CPlayer::restartStats(bool all)
 {
-	if ( all ) memset(weapons,0,sizeof(weapons));
-	memset(weaponsRnd,0,sizeof(weaponsRnd));   //DEC-Weapon (Round) stats
-	memset(attackers,0,sizeof(attackers));
-	memset(victims,0,sizeof(victims));
+	if ( all ) memset(&weapons,0,sizeof(weapons));
+	memset(&weaponsRnd,0,sizeof(weaponsRnd));   //DEC-Weapon (Round) stats
+	memset(&attackers,0,sizeof(attackers));
+	memset(&victims,0,sizeof(victims));
 	life = {};
 }
 

diff --git a/modules/dod/dodx/CMisc.cpp b/modules/dod/dodx/CMisc.cpp
@@ -94,14 +94,14 @@ void CPlayer::restartStats(bool all)
 {
 	if ( all )
 	{
-		memset(weapons,0,sizeof(weapons));
+		memset(&weapons,0,sizeof(weapons));
 		memset(static_cast<void *>(&round),0,sizeof(round));
-		memset(weaponsRnd,0,sizeof(weaponsRnd));
+		memset(&weaponsRnd,0,sizeof(weaponsRnd));
 	}
 
-	memset(weaponsLife,0,sizeof(weaponsLife));   //DEC-Weapon (Round) stats
-	memset(attackers,0,sizeof(attackers));
-	memset(victims,0,sizeof(victims));
+	memset(&weaponsLife,0,sizeof(weaponsLife));   //DEC-Weapon (Round) stats
+	memset(&attackers,0,sizeof(attackers));
+	memset(&victims,0,sizeof(victims));
 	life = {};
 }
 

diff --git a/modules/dod/dodx/moduleconfig.cpp b/modules/dod/dodx/moduleconfig.cpp
@@ -173,7 +173,7 @@ void PlayerPreThink_Post(edict_t *pEntity)
 	{
 		pPlayer->clearRound = 0.0f;
 		memset(static_cast<void *>(&pPlayer->round),0,sizeof(pPlayer->round));
-		memset(pPlayer->weaponsRnd,0,sizeof(pPlayer->weaponsRnd));
+		memset(&pPlayer->weaponsRnd,0,sizeof(pPlayer->weaponsRnd));
 	}
 
 	if (pPlayer->sendScore && pPlayer->sendScore < gpGlobals->time)

diff --git a/modules/mysqlx/AMBuilder b/modules/mysqlx/AMBuilder
@@ -17,18 +17,18 @@ if AMXX.mysql_path:
 
   binary.sources = []
 
-  if builder.target_platform is 'linux' or builder.target_platform is 'mac':
+  if builder.target_platform == 'linux' or builder.target_platform == 'mac':
     binary.compiler.defines += ['stricmp=strcasecmp']
     binary.compiler.linkflags += [
       os.path.join(AMXX.mysql_path, 'lib', 'libmysqlclient_r.a'),
       '-lpthread',
       '-lm',
     ]
-    if builder.target_platform is 'linux':
+    if builder.target_platform == 'linux':
       binary.compiler.linkflags += [
         '-lrt'
       ]
-  elif builder.target_platform is 'windows':
+  elif builder.target_platform == 'windows':
     binary.compiler.linkflags += [
       os.path.join(AMXX.mysql_path, 'lib', 'mysqlclient.lib'),
       'ws2_32.lib',

diff --git a/modules/sqlite/AMBuilder b/modules/sqlite/AMBuilder
@@ -12,7 +12,7 @@ binary.compiler.defines += [
   'HAVE_STDINT_H',
 ]
 
-if builder.target_platform is 'linux' or builder.target_platform is 'mac':
+if builder.target_platform == 'linux' or builder.target_platform == 'mac':
   binary.compiler.defines += ['stricmp=strcasecmp']
   binary.compiler.postlink += ['-lpthread']
 

diff --git a/modules/tfcx/CMisc.cpp b/modules/tfcx/CMisc.cpp
@@ -126,10 +126,10 @@ void CPlayer::Connect(const char* address ){
 
 void CPlayer::restartStats(bool all)
 {
-	if ( all ) memset(weapons,0,sizeof(weapons));
-	memset(weaponsRnd,0,sizeof(weaponsRnd));   //DEC-Weapon (Round) stats
-	memset(attackers,0,sizeof(attackers));
-	memset(victims,0,sizeof(victims));
+	if ( all ) memset(&weapons,0,sizeof(weapons));
+	memset(&weaponsRnd,0,sizeof(weaponsRnd));   //DEC-Weapon (Round) stats
+	memset(&attackers,0,sizeof(attackers));
+	memset(&victims,0,sizeof(victims));
 	life = {};
 }
 

diff --git a/modules/ts/tsx/CMisc.cpp b/modules/ts/tsx/CMisc.cpp
@@ -78,10 +78,10 @@ void CPlayer::Connect(const char* ippp)
 
 void CPlayer::restartStats(bool all)
 {
-	if ( all ) memset(weapons,0,sizeof(weapons));
-	memset(weaponsRnd,0,sizeof(weaponsRnd));   //DEC-Weapon (Round) stats
-	memset(attackers,0,sizeof(attackers));
-	memset(victims,0,sizeof(victims));
+	if ( all ) memset(&weapons,0,sizeof(weapons));
+	memset(&weaponsRnd,0,sizeof(weaponsRnd));   //DEC-Weapon (Round) stats
+	memset(&attackers,0,sizeof(attackers));
+	memset(&victims,0,sizeof(victims));
 	life = {};
 }
 

diff --git a/third_party/zlib/AMBuilder b/third_party/zlib/AMBuilder
@@ -3,7 +3,7 @@ import os, platform
 
 lib = builder.compiler.StaticLibrary('zlib')
 
-if builder.target_platform is 'linux' or builder.target_platform is 'mac':
+if builder.target_platform == 'linux' or builder.target_platform == 'mac':
   lib.compiler.defines += [
     'HAVE_UNISTD_H'
   ]