From 662825d43eafe1b2738a636a201c841a5a043feb Mon Sep 17 00:00:00 2001 From: berenger-bramas <berenger-bramas@2616d619-271b-44dc-8df4-d4a8f33a7222> Date: Mon, 14 Nov 2011 14:58:10 +0000 Subject: [PATCH] Small updates (omp flush(var) is not allowed with intel) git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/scalfmm/scalfmm/trunk@234 2616d619-271b-44dc-8df4-d4a8f33a7222 --- Src/Utils/FOmpBarrier.hpp | 2 +- Src/Utils/FQuickSort.hpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Src/Utils/FOmpBarrier.hpp b/Src/Utils/FOmpBarrier.hpp index 08b075a2f..040af240d 100644 --- a/Src/Utils/FOmpBarrier.hpp +++ b/Src/Utils/FOmpBarrier.hpp @@ -42,7 +42,7 @@ public: if(nbThreadsArrived == nbThreads) { currentNbThread = 0; sense = !sense; - #pragma omp flush(sense) + #pragma omp flush } else { volatile const bool* const ptSense = &sense; diff --git a/Src/Utils/FQuickSort.hpp b/Src/Utils/FQuickSort.hpp index 8a5579eaa..d5d2908c2 100644 --- a/Src/Utils/FQuickSort.hpp +++ b/Src/Utils/FQuickSort.hpp @@ -47,7 +47,7 @@ class FQuickSort { /* Use in the sequential qs */ static IndexType QsPartition(SortType array[], IndexType left, IndexType right){ const IndexType part = right; - Swap(array[part],array[(right + left ) / 2]); + Swap(array[part],array[((right - left ) / 2) + left]); --right; while(true){ -- GitLab