Merge pull request #1349 from piluke/patch-1

erwincoumans · web-flow · commit 6e4707df5fa1 · 2017-09-29T16:20:39.000-07:00
Fix a shadow warning by renaming a parameter in btInfMaskConverter
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)
 		{
 		}
 	};

Original file line number	Diff line number	Diff line change
`@@ -374,8 +374,8 @@ inline int btGetVersion()`
`374`	`374`	`float mask;`
`375`	`375`	`int intmask;`
`376`	`376`	`};`
`377`		`- btInfMaskConverter(int mask = 0x7F800000)`
`378`		`- : intmask(mask)`
	`377`	`+ btInfMaskConverter(int _mask = 0x7F800000)`
	`378`	`+ : intmask(_mask)`
`379`	`379`	`{`
`380`	`380`	`}`
`381`	`381`	`};`