merge Win10/VS2015 changes

2015-12-17 21:15:59 +01:00
parent aee03cd5e5
commit af5bec70cd
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>