Merge pull request #16779 from saskatchewancatch:issue-16777

* Fixes issue 16777.

* core: update Concurrency getNumThreads()
This commit is contained in:
RAJKIRAN NATARAJAN 2020-03-16 07:12:29 -07:00 committed by GitHub
parent 1c2ed2876f
commit 3b2e409fa7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -618,9 +618,9 @@ int getNumThreads(void)
#elif defined HAVE_CONCURRENCY
return 1 + (pplScheduler == 0
return (pplScheduler == 0)
? Concurrency::CurrentScheduler::Get()->GetNumberOfVirtualProcessors()
: pplScheduler->GetNumberOfVirtualProcessors());
: (1 + pplScheduler->GetNumberOfVirtualProcessors());
#elif defined HAVE_PTHREADS_PF