Merge pull request #1349 from piluke/patch-1

Fix a shadow warning by renaming a parameter in btInfMaskConverter
This commit is contained in:
erwincoumans
2017-09-29 16:20:39 -07:00
committed by GitHub

View File

@@ -374,8 +374,8 @@ inline int btGetVersion()
float mask; float mask;
int intmask; int intmask;
}; };
btInfMaskConverter(int mask = 0x7F800000) btInfMaskConverter(int _mask = 0x7F800000)
: intmask(mask) : intmask(_mask)
{ {
} }
}; };