Merge pull request #1349 from piluke/patch-1

Fix a shadow warning by renaming a parameter in btInfMaskConverter
bulletphysics · Sep 29, 2017 · 6e4707d · 6e4707d
2 parents d881d15 + 1360641
commit 6e4707d
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/LinearMath/btScalar.h b/src/LinearMath/btScalar.h
@@ -374,8 +374,8 @@ inline int btGetVersion()
 			float mask;
 			int intmask;
 		};
-		btInfMaskConverter(int mask = 0x7F800000)
-			: intmask(mask)
+		btInfMaskConverter(int _mask = 0x7F800000)
+			: intmask(_mask)
 		{
 		}
 	};