Use CONSTEXPR

xezon · xezon · commit 92e3e3602eca · 2025-07-06T22:25:25.000+02:00
diff --git a/GeneralsMD/Code/GameEngine/Include/Common/SparseMatchFinder.h b/GeneralsMD/Code/GameEngine/Include/Common/SparseMatchFinder.h
@@ -204,9 +204,12 @@ class SparseMatchFinder
 	//-------------------------------------------------------------------------------------------------
 	SparseMatchFinder& operator=(const SparseMatchFinder& other)
 	{
-		if ((FLAGS & SparseMatchFinderFlags_NoCopy) == 0 && this != &other)
+		if CONSTEXPR ((FLAGS & SparseMatchFinderFlags_NoCopy) == 0)
 		{
-			m_bestMatches = other.m_bestMatches;
+			if (this != &other)
+			{
+				m_bestMatches = other.m_bestMatches;
+			}
 		}
 		return *this;
 	}

Original file line number	Diff line number	Diff line change
`@@ -204,9 +204,12 @@ class SparseMatchFinder`
`204`	`204`	`//-------------------------------------------------------------------------------------------------`
`205`	`205`	`SparseMatchFinder& operator=(const SparseMatchFinder& other)`
`206`	`206`	`{`
`207`		`- if ((FLAGS & SparseMatchFinderFlags_NoCopy) == 0 && this != &other)`
	`207`	`+ if CONSTEXPR ((FLAGS & SparseMatchFinderFlags_NoCopy) == 0)`
`208`	`208`	`{`
`209`		`- m_bestMatches = other.m_bestMatches;`
	`209`	`+ if (this != &other)`
	`210`	`+ {`
	`211`	`+ m_bestMatches = other.m_bestMatches;`
	`212`	`+ }`
`210`	`213`	`}`
`211`	`214`	`return *this;`
`212`	`215`	`}`