Merge pull request #7295 from lupustr3:pvlasov/vs11_compat_fix

fb912e1b · Alexander Alekhin · 26ecf2f3 · 0a9470bf · fb912e1b
隐藏空白更改
内联并排

Showing with 2 addition and 0 deletion

modules/core/src/ocl.cpp modules/core/src/ocl.cpp +2 -0

未找到文件。
--- a/modules/core/src/ocl.cpp
+++ b/modules/core/src/ocl.cpp
@@ -45,7 +45,9 @@
 #include <string>
 #include <sstream>
 #include <iostream> // std::cerr
+#if !(defined _MSC_VER) || (defined _MSC_VER && _MSC_VER > 1700)
 #include <inttypes.h>
+#endif

 #define CV_OPENCL_ALWAYS_SHOW_BUILD_LOG 0
 #define CV_OPENCL_SHOW_RUN_ERRORS       0