OSSForks/opencv
1
0
Fork 0
mirror of https://github.com/zebrajr/opencv.git synced 2025-12-06 12:19:50 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #12449 from Nuzhny007:master

Browse Source 
* Fixed compilation error WITH_OPENMP under Windows

* Move up OpenMP condition
This commit is contained in:
Sergey Nuzhny 2018-09-08 23:20:14 +03:00 committed by Alexander Alekhin
parent fd0df5a89b
commit 80610ca054
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/core/src/parallel.cpp
View File

@ -410,6 +410,8 @@ namespace
}); });
} }
}; };
#elif defined HAVE_OPENMP
typedef ParallelLoopBodyWrapper ProxyLoopBody;
#elif defined HAVE_GCD #elif defined HAVE_GCD
typedef ParallelLoopBodyWrapper ProxyLoopBody; typedef ParallelLoopBodyWrapper ProxyLoopBody;
static void block_function(void* context, size_t index) static void block_function(void* context, size_t index)