Make core/internal.hpp a private header

samples/gpu/multi.cpp

@@ -11,6 +11,18 @@
 #include "opencv2/core/core.hpp"
 #include "opencv2/gpu/gpu.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
+#endif
+
 #if !defined(HAVE_CUDA) || !defined(HAVE_TBB)
 
 int main()
@@ -28,8 +40,6 @@ int main()
 
 #else
 
-#include "opencv2/core/internal.hpp" // For TBB wrappers
-
 using namespace std;
 using namespace cv;
 using namespace cv::gpu;
@@ -60,7 +70,7 @@ int main()
 
     // Execute calculation in two threads using two GPUs
     int devices[] = {0, 1};
-    parallel_do(devices, devices + 2, Worker());
+    tbb::parallel_do(devices, devices + 2, Worker());
 
     return 0;
 }