Remove some warnings

d288e5f8 · COULAUD Olivier · cbbed01b · d288e5f8 · d288e5f8
Commit d288e5f8 authored Sep 23, 2013 by COULAUD Olivier
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

Src/Core/FFmmAlgorithm.hpp Src/Core/FFmmAlgorithm.hpp +1 -1

Src/Core/FFmmAlgorithmThreadProc.hpp Src/Core/FFmmAlgorithmThreadProc.hpp +2 -2

No files found.
--- 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:

--- 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;