AnotherFoxGuy/polyvox
1
0
Fork 0
Code Issues Pull Requests Activity

Attempting to work around a GCC warning.

Browse Source
This commit is contained in:
Daviw Williams 2013-10-23 16:33:42 +02:00
parent 8943822046
commit 3fe92086f1
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
library/PolyVoxCore/include/PolyVoxCore/MaterialDensityPair.h
View File

@ -77,15 +77,19 @@ namespace PolyVox
void setDensity(Type uDensity)
{
POLYVOX_ASSERT(uDensity >= getMinDensity(), "Density out of range");
POLYVOX_ASSERT(uDensity <= getMaxDensity(), "Density out of range");
// Validate range of parameters. The casts are used to bypass a GCC warning 'comparison
// is always true due to limited range of data type' which is not helpful in this case.
POLYVOX_ASSERT(static_cast<int32_t>(uDensity) >= static_cast<int32_t>(getMinDensity()), "Density out of range");
POLYVOX_ASSERT(static_cast<int32_t>(uDensity) <= static_cast<int32_t>(getMaxDensity()), "Density out of range");
m_uDensity = uDensity;
}
void setMaterial(Type uMaterial)
{
POLYVOX_ASSERT(uMaterial >= 0, "Material out of range");
POLYVOX_ASSERT(uMaterial <= (0x01 << NoOfMaterialBits) - 1, "Material out of range");
// Validate range of parameters. The casts are used to bypass a GCC warning 'comparison
// is always true due to limited range of data type' which is not helpful in this case.
POLYVOX_ASSERT(static_cast<int32_t>(uMaterial) >= static_cast<int32_t>(0), "Material out of range");
POLYVOX_ASSERT(static_cast<int32_t>(uMaterial) <= static_cast<int32_t>((0x01 << NoOfMaterialBits) - 1), "Material out of range");
m_uMaterial = uMaterial;
}