From c7b06b14a40e5b49863ab98da81837df1d58539d Mon Sep 17 00:00:00 2001 From: Alan Morris Date: Wed, 15 Apr 2020 14:20:21 -0600 Subject: [PATCH] Re-enable threads, add clang warning pragma --- ExternalLibs/trimesh2/include/map.h | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/ExternalLibs/trimesh2/include/map.h b/ExternalLibs/trimesh2/include/map.h index 8793a5c141..57c5099b3c 100755 --- 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 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 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