diff options
| author | erwincoumans <erwin.coumans@gmail.com> | 2019-05-27 14:01:43 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-27 14:01:43 -0700 |
| commit | 78e1baede85026dea5eb43fbcda4bf8a08033031 (patch) | |
| tree | 5a3024f5e22e2cab51604b41932e3c5ac75f01fd | |
| parent | 26486d56d79b2bfe169012277efe402487fd30aa (diff) | |
| parent | c3790448bc62bdc05118ea40fd869b4ccf299bcb (diff) | |
| download | bullet3-78e1baede85026dea5eb43fbcda4bf8a08033031.tar.gz | |
Merge pull request #2257 from mtheall/master
Return at least 1 from btGetNumHardwareThreads
| -rw-r--r-- | src/LinearMath/TaskScheduler/btThreadSupportPosix.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/LinearMath/TaskScheduler/btThreadSupportPosix.cpp b/src/LinearMath/TaskScheduler/btThreadSupportPosix.cpp index 02f4ed163..d80af09c7 100644 --- a/src/LinearMath/TaskScheduler/btThreadSupportPosix.cpp +++ b/src/LinearMath/TaskScheduler/btThreadSupportPosix.cpp @@ -45,14 +45,14 @@ subject to the following restrictions: int btGetNumHardwareThreads() { - return btMin<int>(BT_MAX_THREAD_COUNT, std::thread::hardware_concurrency()); + return btMax(1u, btMin(BT_MAX_THREAD_COUNT, std::thread::hardware_concurrency())); } #else int btGetNumHardwareThreads() { - return btMin<int>(BT_MAX_THREAD_COUNT, sysconf(_SC_NPROCESSORS_ONLN)); + return btMax(1, btMin<int>(BT_MAX_THREAD_COUNT, sysconf(_SC_NPROCESSORS_ONLN))); } #endif |