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

Pass in a const reference to a CompareFunc for quickSort, to make Visual Studio 2011 happy.

Browse Source 
Thanks to Cameron Hart
Fixes Issue 588
This commit is contained in:
erwin.coumans
2012-01-23 21:39:44 +00:00
parent ce50f11fea
commit f754952232
11 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/LinearMath/btAlignedObjectArray.h
View File

@@ -314,7 +314,7 @@ protected:
};
template <typename L>
void quickSortInternal(L CompareFunc,int lo, int hi)
void quickSortInternal(const L& CompareFunc,int lo, int hi)
{
// lo is the lower index, hi is the upper index
// of the region of array a that is to be sorted
@@ -344,7 +344,7 @@ protected:
template <typename L>
void quickSort(L CompareFunc)
void quickSort(const L& CompareFunc)
{
//don't sort 0 or 1 elements
if (size()>1)
@@ -356,7 +356,7 @@ protected:
///heap sort from http://www.csse.monash.edu.au/~lloyd/tildeAlgDS/Sort/Heap/
template <typename L>
void downHeap(T *pArr, int k, int n,L CompareFunc)
void downHeap(T *pArr, int k, int n, const L& CompareFunc)
{
/* PRE: a[k+1..N] is a heap */
/* POST: a[k..N] is a heap */
@@ -402,7 +402,7 @@ protected:
}
template <typename L>
void heapSort(L CompareFunc)
void heapSort(const L& CompareFunc)
{
/* sort a[0..N-1], N.B. 0 to N-1 */
int k;