Merge pull request #1349 from piluke/patch-1

Fix a shadow warning by renaming a parameter in btInfMaskConverter
2017-09-29 16:20:39 -07:00
parent d881d15f10 1360641ad9
commit 6e4707df5f
1 changed files with 2 additions and 2 deletions
--- 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)
 		{
 		}
 	};