Re-enable threads, add clang warning pragma

SCIInstitute · Apr 15, 2020 · c7b06b1 · c7b06b1
1 parent 132a076
commit c7b06b1
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/ExternalLibs/trimesh2/include/map.h b/ExternalLibs/trimesh2/include/map.h
@@ -2,6 +2,9 @@
  * Copyright (c) 2013 University of Utah
  */
 
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wdeprecated-declarations"
+
 #ifndef __map_H
 #define __map_H
 
@@ -48,8 +51,8 @@ struct map
         typedef MapFilter<FType,InType,OutType> MF;
         typename MF::Pointer mf = MF::New();
         mf->SetFunctor(&functor); // handles output
-        // if(numThreads>0)
-        //     mf->SetNumberOfThreads(numThreads);
+	if(numThreads>0)
+            mf->SetNumberOfThreads(numThreads);
         mf->SetInput(in);
         if(outRegion.GetSize()[0] > 0)
         {
@@ -96,8 +99,8 @@ struct reduce
     typedef ReduceFilter<FType,InType,OutType> RF;
     typename RF::Pointer rf = RF::New();
     rf->SetFunctor(&functor);
-    // if(numThreads>0)
-    //   rf->SetNumberOfThreads(numThreads);
+    if(numThreads>0)
+      rf->SetNumberOfThreads(numThreads);
     rf->SetInput(in);
 
     rf->Update(); // throws
@@ -110,3 +113,5 @@ struct reduce
 
 
 #endif
+
+#pragma clang diagnostic pop