Merge pull request #4906 from VinInn/NoTBBByDefault

Revert tbb by default
cms-sw · Aug 8, 2014 · 0265afc · 0265afc
2 parents 59acde3 + 0c5f558
commit 0265afc
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/RecoTracker/CkfPattern/src/CkfTrackCandidateMakerBase.cc b/RecoTracker/CkfPattern/src/CkfTrackCandidateMakerBase.cc
@@ -42,7 +42,9 @@
 #include<functional>
 
 #include <thread>
+#ifdef VI_TBB
 #include "tbb/parallel_for.h"
+#endif
 
 #include "RecoTracker/CkfPattern/interface/PrintoutHelper.h"
 
@@ -299,7 +301,7 @@ namespace cms{
       // end of loop over seeds
 
 
-#ifndef VI_NOTBB
+#ifdef VI_TBB
      tbb::parallel_for(0UL,collseed_size,1UL,theLoop);
 #else
 #ifdef VI_OMP