Linux compile error/warning fixes

This commit is contained in:
Jacob Storen
2015-05-29 02:27:23 -07:00
parent cdcfd62163
commit 0bdc8916d7
3 changed files with 10 additions and 6 deletions

View File

@@ -21,7 +21,7 @@
#include "RigFemPart.h"
#include <cmath>
//--------------------------------------------------------------------------------------------------
///
@@ -122,7 +122,7 @@ void RigFemPartGrid::generateStructGridData()
// Scoped to show that nothing bleeds further to K-loop
{
if (iCoord > m_elmentIJKCounts[0]) m_elmentIJKCounts[0] = iCoord;
if (iCoord > static_cast<int>(m_elmentIJKCounts[0])) m_elmentIJKCounts[0] = iCoord;
++jCoord;
@@ -146,7 +146,7 @@ void RigFemPartGrid::generateStructGridData()
}
{
if (jCoord > m_elmentIJKCounts[1]) m_elmentIJKCounts[1] = jCoord;
if (jCoord > static_cast<int>(m_elmentIJKCounts[1])) m_elmentIJKCounts[1] = jCoord;
++kCoord;
@@ -170,7 +170,7 @@ void RigFemPartGrid::generateStructGridData()
}
}
if (kCoord > m_elmentIJKCounts[2]) m_elmentIJKCounts[2] = kCoord;
if (kCoord > static_cast<int>(m_elmentIJKCounts[2])) m_elmentIJKCounts[2] = kCoord;
}
}
@@ -228,6 +228,10 @@ cvf::Vec3i RigFemPartGrid::findMainIJKFaces(int elementIndex)
}
else
{
mainElmDirections[0] = cvf::Vec3f::ZERO;
mainElmDirections[1] = cvf::Vec3f::ZERO;
mainElmDirections[2] = cvf::Vec3f::ZERO;
CVF_ASSERT(false);
}