From f15eeb0283fe2eec3950c337a61aa6f5516f0180 Mon Sep 17 00:00:00 2001 From: Peter Boyle Date: Fri, 12 Jul 2019 06:47:01 +0100 Subject: [PATCH] localise scope of variables declared in macro --- Grid/threads/Pragmas.h | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/Grid/threads/Pragmas.h b/Grid/threads/Pragmas.h index 7ab3142b..af74d03b 100644 --- a/Grid/threads/Pragmas.h +++ b/Grid/threads/Pragmas.h @@ -108,13 +108,15 @@ void LambdaApplySIMT(uint64_t Isites, uint64_t Osites, lambda Lambda) // Copy the for_each_n style ; Non-blocking variant #define accelerator_forNB( iterator, num, nsimd, ... ) \ - typedef uint64_t Iterator; \ - auto lambda = [=] accelerator (Iterator lane,Iterator iterator) mutable { \ - __VA_ARGS__; \ - }; \ - dim3 cu_threads(gpu_threads,nsimd); \ - dim3 cu_blocks ((num+gpu_threads-1)/gpu_threads); \ - LambdaApplySIMT<<>>(nsimd,num,lambda); + { \ + typedef uint64_t Iterator; \ + auto lambda = [=] accelerator (Iterator lane,Iterator iterator) mutable { \ + __VA_ARGS__; \ + }; \ + dim3 cu_threads(gpu_threads,nsimd); \ + dim3 cu_blocks ((num+gpu_threads-1)/gpu_threads); \ + LambdaApplySIMT<<>>(nsimd,num,lambda); \ + } // Copy the for_each_n style ; Non-blocking variant (default #define accelerator_for( iterator, num, nsimd, ... ) \