From b979064817fcba744b4b4cefd5216998e82d8c42 Mon Sep 17 00:00:00 2001 From: Lunkhound Date: Fri, 6 Jan 2017 21:20:44 -0800 Subject: [PATCH] fix compile error on GCC --- examples/MultiThreadedDemo/CommonRigidBodyMTBase.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/MultiThreadedDemo/CommonRigidBodyMTBase.cpp b/examples/MultiThreadedDemo/CommonRigidBodyMTBase.cpp index d29e3dd71..a3a6e742a 100644 --- 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 );