moved parallel_for_ and ParallelLoopBody to core.hpp

modules/core/src/parallel.cpp

@@ -48,8 +48,25 @@
 #  include <omp.h>
 #elif defined HAVE_GCD
 #  include <dispatch/dispatch.h>
+#elif defined 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 // end TBB version
 #endif // HAVE_CONCURRENCY
 
+/*
+    HAVE_TBB - using TBB
+    HAVE_GCD - using GCD
+    HAVE_OPENMP - using OpenMP
+    HAVE_CONCURRENCY - using visual studio 2010 concurrency
+*/
+
 namespace cv
 {
     ParallelLoopBody::~ParallelLoopBody() { }

modules/core/src/precomp.hpp

@@ -50,7 +50,6 @@
 #include "opencv2/core/core.hpp"
 #include "opencv2/core/core_c.h"
 #include "opencv2/core/internal.hpp"
-#include "opencv2/core/parallel_tool.hpp"
 
 #include <assert.h>
 #include <ctype.h>