From 077115bd4accfa44af660bc4a47ca30f2dab4817 Mon Sep 17 00:00:00 2001 From: Ilya Lavrenov Date: Mon, 24 Sep 2012 12:40:20 +0400 Subject: [PATCH] debug --- modules/core/src/parallel.cpp | 36 +++++++++++++++++------------------- 1 file changed, 17 insertions(+), 19 deletions(-) diff --git a/modules/core/src/parallel.cpp b/modules/core/src/parallel.cpp index 8072a11..c3b79a6 100644 --- a/modules/core/src/parallel.cpp +++ b/modules/core/src/parallel.cpp @@ -43,31 +43,29 @@ #include "precomp.hpp" #if !defined HAVE_TBB && !defined HAVE_OPENMP && !defined HAVE_GCD && !defined HAVE_CONCURRENCY - -#ifdef __APPLE__ -#define HAVE_GCD -#elif defined _MSC_VER && _MSC_VER >= 1600 -#define HAVE_CONCURRENCY -#endif - + #ifdef __APPLE__ + //#define HAVE_GDC + #elif defined _MSC_VER && _MSC_VER >= 1600 + #define HAVE_CONCURRENCY + #endif #endif #ifdef HAVE_CONCURRENCY -# include + #include #elif defined HAVE_OPENMP -# include + #include #elif defined HAVE_GCD -# include + #include #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 + #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 /* -- 2.7.4