Merge pull request #5825 from GregoryMorse:master

2015-12-18 07:17:29 +00:00
parent 03e74330fa af5bec70cd
commit d02627ea89
10 changed files with 584 additions and 10396 deletions
--- a/modules/core/src/parallel.cpp
+++ b/modules/core/src/parallel.cpp
@@ -107,7 +107,7 @@
    #elif defined HAVE_GCD
        #include <dispatch/dispatch.h>
        #include <pthread.h>
-    #elif defined WINRT
+    #elif defined WINRT && _MSC_VER < 1900
        #include <ppltasks.h>
    #elif defined HAVE_CONCURRENCY
        #include <ppl.h>