Bart/bullet3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix unit test under Ubuntu

Browse Source 
fixes Issue 629, thanks to joshua.downer for the report and fix
This commit is contained in:
erwin.coumans
2012-07-31 16:53:44 +00:00
parent a734e86453
commit 1a3cbb0177
1 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
UnitTests/BulletUnitTests/TestLinearMath.h
View File

@@ -8,6 +8,17 @@
#define TEST_NUM_UNITSPHERE_POINTS 42 #define TEST_NUM_UNITSPHERE_POINTS 42
namespace
{
struct compLess
{
bool operator()(const int& p1, const int& p2) const
{
return p1 < p2;
}
};
}
static btVector3 sPenetrationDirections[TEST_NUM_UNITSPHERE_POINTS] = static btVector3 sPenetrationDirections[TEST_NUM_UNITSPHERE_POINTS] =
{ {
btVector3(btScalar(0.000000) , btScalar(-0.000000),btScalar(-1.000000)), btVector3(btScalar(0.000000) , btScalar(-0.000000),btScalar(-1.000000)),
@@ -116,14 +127,7 @@ public:
m_unsortedIntegers[i] = i; m_unsortedIntegers[i] = i;
} }
struct compLess m_unsortedIntegers.quickSort(::compLess());
{
bool operator()(const int& p1, const int& p2) const
{
return p1 < p2;
}
};
m_unsortedIntegers.quickSort(compLess());
for (int i=1;i<numElems;i++) for (int i=1;i<numElems;i++)
{ {
CPPUNIT_ASSERT(m_unsortedIntegers[i-1]<=m_unsortedIntegers[i]); CPPUNIT_ASSERT(m_unsortedIntegers[i-1]<=m_unsortedIntegers[i]);
@@ -132,7 +136,7 @@ public:
{ {
m_unsortedIntegers[i] = numElems-i; m_unsortedIntegers[i] = numElems-i;
} }
m_unsortedIntegers.quickSort(compLess()); m_unsortedIntegers.quickSort(::compLess());
for (int i=1;i<numElems;i++) for (int i=1;i<numElems;i++)
{ {
CPPUNIT_ASSERT(m_unsortedIntegers[i-1]<=m_unsortedIntegers[i]); CPPUNIT_ASSERT(m_unsortedIntegers[i-1]<=m_unsortedIntegers[i]);