fix compile error on GCC

2017-01-06 21:20:44 -08:00
parent ea0df70c77
commit b979064817
1 changed files with 1 additions and 1 deletions
--- a/examples/MultiThreadedDemo/CommonRigidBodyMTBase.cpp
+++ b/examples/MultiThreadedDemo/CommonRigidBodyMTBase.cpp
@@ -749,7 +749,7 @@ void CommonRigidBodyMTBase::createEmptyDynamicsWorld()
 #if USE_PARALLEL_ISLAND_SOLVER
        {
            btConstraintSolver* solvers[ BT_MAX_THREAD_COUNT ];
-            int maxThreadCount = min( BT_MAX_THREAD_COUNT, TaskManager::getMaxNumThreads() );
+            int maxThreadCount = btMin( int(BT_MAX_THREAD_COUNT), TaskManager::getMaxNumThreads() );
            for ( int i = 0; i < maxThreadCount; ++i )
            {
                solvers[ i ] = createSolverByType( m_solverType );