From ea97ed3e30a2a767b0aa03c312cd76257cc6c9e8 Mon Sep 17 00:00:00 2001 From: ejcoumans Date: Tue, 13 Mar 2007 15:21:01 +0000 Subject: [PATCH] fix in template usage, error only reported on Sun Solaris ?!? Thanks Noerghel for reporting! --- .../CollisionDispatch/btSimulationIslandManager.cpp | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/src/BulletCollision/CollisionDispatch/btSimulationIslandManager.cpp b/src/BulletCollision/CollisionDispatch/btSimulationIslandManager.cpp index f1a7eb0dc..122071f80 100644 --- a/src/BulletCollision/CollisionDispatch/btSimulationIslandManager.cpp +++ b/src/BulletCollision/CollisionDispatch/btSimulationIslandManager.cpp @@ -112,13 +112,6 @@ inline int getIslandId(const btPersistentManifold* lhs) } -bool btPersistentManifoldSortPredicate(const btPersistentManifold* lhs, const btPersistentManifold* rhs) -{ - int rIslandId0,lIslandId0; - rIslandId0 = getIslandId(rhs); - lIslandId0 = getIslandId(lhs); - return lIslandId0 < rIslandId0; -} /// function object that routes calls to operator< @@ -276,7 +269,7 @@ void btSimulationIslandManager::buildAndProcessIslands(btDispatcher* dispatcher, //std::sort(islandmanifold.begin(), islandmanifold.end(), btPersistentManifoldSortPredicate); //we should do radix sort, it it much faster (O(n) instead of O (n log2(n)) - islandmanifold.heapSort(btPersistentManifoldSortPredicate); + islandmanifold.heapSort(btPersistentManifoldSortPredicate()); //now process all active islands (sets of manifolds for now)