diff --git a/Src/Core/FFmmAlgorithm.hpp b/Src/Core/FFmmAlgorithm.hpp index 317b9cc54674bc2ac0feb37366ae18d682e1de77..55cf6a33327be544124ee490a12a2e2f09e53c13 100755 --- a/Src/Core/FFmmAlgorithm.hpp +++ b/Src/Core/FFmmAlgorithm.hpp @@ -81,7 +81,7 @@ public: if(operationsToProceed & FFmmL2L) downardPass(); - if(operationsToProceed & FFmmP2P || operationsToProceed & FFmmL2P) directPass(); + if( (operationsToProceed & FFmmP2P) || (operationsToProceed & FFmmL2P) ) directPass(); } private: diff --git a/Src/Core/FFmmAlgorithmThreadProc.hpp b/Src/Core/FFmmAlgorithmThreadProc.hpp index d2b0f3a2b1f8cb75be98bccc9b5adeec1500eb30..fd0606a060cdef43f92346b5080745a5c70f0555 100755 --- a/Src/Core/FFmmAlgorithmThreadProc.hpp +++ b/Src/Core/FFmmAlgorithmThreadProc.hpp @@ -112,7 +112,7 @@ public: * An assert is launched if one of the arguments is null */ FFmmAlgorithmThreadProc(const FMpi::FComm& inComm, OctreeClass* const inTree, KernelClass* const inKernels) - : tree(inTree) , kernels(0), comm(inComm), numberOfLeafs(0), + : tree(inTree) , kernels(0), comm(inComm), iterArray(nullptr), numberOfLeafs(0), MaxThreads(omp_get_max_threads()), nbProcess(inComm.processCount()), idProcess(inComm.processId()), OctreeHeight(tree->getHeight()),intervals(new Interval[inComm.processCount()]), workingIntervalsPerLevel(new Interval[inComm.processCount() * tree->getHeight()]){ @@ -205,7 +205,7 @@ public: if(operationsToProceed & FFmmL2L) downardPass(); - if(operationsToProceed & FFmmP2P || operationsToProceed & FFmmL2P) directPass(); + if( (operationsToProceed & FFmmP2P) || (operationsToProceed & FFmmL2P) ) directPass(); // delete array delete [] iterArray;