Updated TBB search script and code checks

2016-11-23 12:44:44 +03:00
parent 46a333ed94
commit 695c518384
11 changed files with 130 additions and 194 deletions
@@ -12,15 +12,10 @@
 #include "opencv2/cudaarithm.hpp"

 #ifdef HAVE_TBB
-#  include "tbb/tbb_stddef.h"
-#  if TBB_VERSION_MAJOR*100 + TBB_VERSION_MINOR >= 202
-#    include "tbb/tbb.h"
-#    include "tbb/task.h"
-#    undef min
-#    undef max
-#  else
-#    undef HAVE_TBB
-#  endif
+#  include "tbb/tbb.h"
+#  include "tbb/task.h"
+#  undef min
+#  undef max
 #endif

 #if !defined(HAVE_CUDA) || !defined(HAVE_TBB)