Merge pull request #12449 from Nuzhny007:master
authorSergey Nuzhny <nuzhny@mail.ru>
Sat, 8 Sep 2018 20:20:14 +0000 (23:20 +0300)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Sat, 8 Sep 2018 20:20:14 +0000 (23:20 +0300)
commit80610ca054a78634a4f57e73741af21a116b8b82
tree69ebfad3417d78d935615e0b08ad6ac3d95a24bb
parentfd0df5a89bcdb1f1b24c9d6ae8ca38ed90d9f4be
Merge pull request #12449 from Nuzhny007:master

* Fixed compilation error WITH_OPENMP under Windows

* Move up OpenMP condition
modules/core/src/parallel.cpp