Commit 7e2215ff authored by COULAUD Olivier's avatar COULAUD Olivier
Browse files

remove warnings

parent d13c9d1f
...@@ -62,10 +62,6 @@ OPTION( ScalFMM_BUILD_ONLY_LIB "Set to ON to compile ionly the lib (examp ...@@ -62,10 +62,6 @@ OPTION( ScalFMM_BUILD_ONLY_LIB "Set to ON to compile ionly the lib (examp
SET(SCALFMM_LIBRARIES "") SET(SCALFMM_LIBRARIES "")
SET(ScaLFMM_CXX_FLAGS "") SET(ScaLFMM_CXX_FLAGS "")
# #
# Compile option
# -Wall Wnosign-conversion
SET(ScaLFMM_CXX_FLAGS "-std=c++11 -fpic -Wzero-as-null-pointer-constant -Wall ")
#-Wshadow -Wpointer-arith -Wcast-qual -Wconversion -Wall -Wnosign-conversion ")
# #
# Test if openmp is here # Test if openmp is here
# #
...@@ -136,7 +132,14 @@ if( ScalFMM_ATTACHE_SOURCE ) ...@@ -136,7 +132,14 @@ if( ScalFMM_ATTACHE_SOURCE )
SET(ScaLFMM_CXX_FLAGS "${ScaLFMM_CXX_FLAGS} -g") SET(ScaLFMM_CXX_FLAGS "${ScaLFMM_CXX_FLAGS} -g")
endif() endif()
# Compile option
# -Wall Wnosign-conversion
if(CMAKE_CXX_COMPILER_ID STREQUAL "Intel")
SET(ScaLFMM_CXX_FLAGS "${ScaLFMM_CXX_FLAGS} -std=c++11 -fpic -Wall ")
#-Wshadow -Wpointer-arith -Wcast-qual -Wconversion -Wall -Wnosign-conversion ")
else()
SET(ScaLFMM_CXX_FLAGS "${ScaLFMM_CXX_FLAGS} -std=c++11 -fpic -Wzero-as-null-pointer-constant -Wall ")
endif()
# Trace # Trace
MESSAGE( STATUS "ScalFMM_USE_TRACE = ${ScalFMM_USE_TRACE}" ) MESSAGE( STATUS "ScalFMM_USE_TRACE = ${ScalFMM_USE_TRACE}" )
if( ScalFMM_USE_TRACE ) if( ScalFMM_USE_TRACE )
......
...@@ -16,14 +16,14 @@ ...@@ -16,14 +16,14 @@
#ifndef FADAPTSEQALGORITHM_HPP #ifndef FADAPTSEQALGORITHM_HPP
#define FADAPTSEQALGORITHM_HPP #define FADAPTSEQALGORITHM_HPP
#include "../Utils/FGlobal.hpp" #include "Utils/FGlobal.hpp"
#include "../Utils/FAssert.hpp" #include "Utils/FAssert.hpp"
#include "../Utils/FLog.hpp" #include "Utils/FLog.hpp"
#include "../Utils/FTrace.hpp" #include "Utils/FTrace.hpp"
#include "../Utils/FTic.hpp" #include "Utils/FTic.hpp"
#include "../Containers/FOctree.hpp" #include "Containers/FOctree.hpp"
#include "../Containers/FVector.hpp" #include "Containers/FVector.hpp"
#include "Core/FCoreCommon.hpp" #include "Core/FCoreCommon.hpp"
......
// =================================================================================== // ===================================================================================
// Copyright ScalFmm 2011 INRIA, Olivier Coulaud, Bérenger Bramas, Matthias Messner // Copyright ScalFmm 2011 INRIA
// olivier.coulaud@inria.fr, berenger.bramas@inria.fr // olivier.coulaud@inria.fr, berenger.bramas@inria.fr
// This software is a computer program whose purpose is to compute the FMM. // This software is a computer program whose purpose is to compute the FMM.
// //
...@@ -53,10 +53,10 @@ class TestBuilder : public FUTester<TestBuilder> { ...@@ -53,10 +53,10 @@ class TestBuilder : public FUTester<TestBuilder> {
FAbstractAlgorithm*const algo = FAlgorithmBuilder::BuildAlgorithm<OctreeClass, CellClass, ContainerClass, KernelClass, LeafClass>(&tree, &kernel, 0, false); FAbstractAlgorithm*const algo = FAlgorithmBuilder::BuildAlgorithm<OctreeClass, CellClass, ContainerClass, KernelClass, LeafClass>(&tree, &kernel, 0, false);
#ifndef ScalFMM_USE_MPI #ifndef ScalFMM_USE_MPI
uassert(dynamic_cast<FFmmAlgorithm<OctreeClass, CellClass, ContainerClass, KernelClass, LeafClass>*>(algo) != 0 || uassert(dynamic_cast<FFmmAlgorithm<OctreeClass, CellClass, ContainerClass, KernelClass, LeafClass>*>(algo) != nullptr ||
dynamic_cast<FFmmAlgorithmThread<OctreeClass, CellClass, ContainerClass, KernelClass, LeafClass>*>(algo) != 0); dynamic_cast<FFmmAlgorithmThread<OctreeClass, CellClass, ContainerClass, KernelClass, LeafClass>*>(algo) != nullptr);
#else #else
uassert(dynamic_cast<FFmmAlgorithmThreadProc<OctreeClass, CellClass, ContainerClass, KernelClass, LeafClass>*>(algo) != 0); uassert(dynamic_cast<FFmmAlgorithmThreadProc<OctreeClass, CellClass, ContainerClass, KernelClass, LeafClass>*>(algo) != nullptr);
#endif #endif
delete algo; delete algo;
} }
...@@ -67,9 +67,9 @@ class TestBuilder : public FUTester<TestBuilder> { ...@@ -67,9 +67,9 @@ class TestBuilder : public FUTester<TestBuilder> {
FAbstractAlgorithm*const algo = FAlgorithmBuilder::BuildAlgorithm<OctreeClass, CellClass, ContainerClass, KernelClass, LeafClass>(&tree, &kernel, 0, true); FAbstractAlgorithm*const algo = FAlgorithmBuilder::BuildAlgorithm<OctreeClass, CellClass, ContainerClass, KernelClass, LeafClass>(&tree, &kernel, 0, true);
#ifndef ScalFMM_USE_MPI #ifndef ScalFMM_USE_MPI
uassert(dynamic_cast<FFmmAlgorithmPeriodic<OctreeClass, CellClass, ContainerClass, KernelClass, LeafClass>*>(algo) != 0 ); uassert(dynamic_cast<FFmmAlgorithmPeriodic<OctreeClass, CellClass, ContainerClass, KernelClass, LeafClass>*>(algo) != nullptr );
#else #else
uassert(dynamic_cast<FFmmAlgorithmThreadProcPeriodic<OctreeClass, CellClass, ContainerClass, KernelClass, LeafClass>*>(algo) != 0); uassert(dynamic_cast<FFmmAlgorithmThreadProcPeriodic<OctreeClass, CellClass, ContainerClass, KernelClass, LeafClass>*>(algo) != nullptr);
#endif #endif
delete algo; delete algo;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment