From 1360641ad9c74ee9f3aacdf3e452f923e53f01e9 Mon Sep 17 00:00:00 2001
From: Luke <lukemontalvo@gmail.com>
Date: Fri, 29 Sep 2017 15:44:14 -0500
Subject: [PATCH] Fix a shadow warning by renaming a parameter in
 btInfMaskConverter

---
 src/LinearMath/btScalar.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/LinearMath/btScalar.h b/src/LinearMath/btScalar.h
index 174205c7ff..bffb2ce274 100644
--- 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)
 		{
 		}
 	};