📣 An issue occured with the embedded container registry on October 25 2021, between 10:30 and 12:10 (UTC+2). Any persisting issues should be reported to CC-IN2P3 Support. 🐛

Commit c87f4555 authored by Jean-Eric Campagne's avatar Jean-Eric Campagne
Browse files

clang support. fix compil warning

parent cc808206
# Flag preprocesseur
CPPFLAGS = -DDarwin -I/opt/local/include
# Def compilateur C et flags
CC = clang
# Replace [CNFPHFLF] by specific compilation flags below (done by configure)
CFLAGS = -fno-common -O
# With optimization flags
# CFLAGS = -fno-common -g -fastf -mtune=G5 -fPIC
# Def compilateur C++ et flags
CXX = clang++
#JEC add -fopenmp -O3 -Wa,-q
CXXFLAGS = -fno-common -g -O3 -fopenmp -Wall -std=c++11 -ffast-math -m64
# flags specifiques pour templates repository...
CXXTEMPFLG =
# Compilo fortran
FC = gfortran
FFLAGS =
# Pour fabriquer les lib .a
AR = libtool
ARFLAGS = -static -o
# Ordres de compilation
CCOMPILE = $(CC) $(CPPFLAGS) $(CFLAGS) -c
CXXCOMPILE = $(CXX) $(CPPFLAGS) $(CXXFLAGS) -c
FCCOMPILE = $(FC) $(FFLAGS) -c
# Extension de nom pour les librairies partagees
SLEXT = dylib
# Fabrication de librairies partagees
CMDSHLCXX = $(CXX) $(CXXFLAGS) $(CXXTEMPFLG) -dynamiclib
LIBFORT =
# Commande de link pour creation d'executables
CXXLINK = $(CXX) $(CXXFLAGS) -bind_at_load
# Commande de link pour creation de module pouvant etre charge dynamiquement
CXXDLL = $(CXX) $(CXXFLAGS) -bundle
......@@ -11,7 +11,7 @@ CFLAGS = -fno-common -g -O -fPIC
# Def compilateur C++ et flags
CXX = g++
#JEC add -fopenmp -O3 -Wa,-q
CXXFLAGS = -fno-common -g -O3 -fPIC -fopenmp -Wa,-q -Wall -std=c++11
CXXFLAGS = -fno-common -g -O3 -fPIC -fopenmp -Wa,-q -Wall -Wpedantic -Wno-deprecated-declarations -std=c++11 -march=native -ffast-math -m64
# flags specifiques pour templates repository...
CXXTEMPFLG =
# Compilo fortran
......
......@@ -18,6 +18,7 @@ ifeq ($(MACH), Linux)
BOOSTINC = -I$(BOOSTDIR)
else
include Darwin_g++_omp_make.inc
# include Darwin_clang_omp_make.inc
# ===== nNative BLAS (Darwin)
BLASYES = -DCBLAS -flax-vector-conversions
BLASLIBN = -framework Accelerate
......@@ -105,8 +106,8 @@ tidy :
.PHONY: clean
clean :
rm -f $(OBJ)/*
rm -f $(EXE)/*
rm -f $(LIB)/*
rm -rf $(EXE)/*
rm -rf $(LIB)/*
#C++ common Objects
CXXOBJ = $(OBJ)laguerreBuilder.o \
......
......@@ -97,8 +97,10 @@ class LaguerreSphericalTransform {
//! Destructor
virtual ~LaguerreSphericalTransform() {
if(sphere_) delete sphere_; sphere_ = 0;
if(lagTrans_) delete lagTrans_; lagTrans_ = 0;
if(sphere_) delete sphere_;
sphere_ = 0;
if(lagTrans_) delete lagTrans_;
lagTrans_ = 0;
}
//! Geometry helper
......
......@@ -66,7 +66,8 @@ public:
//! Destructor
virtual ~Laguerre2Bessel() {
if(jnu_) delete jnu_; jnu_ = 0;
if(jnu_) delete jnu_;
jnu_ = 0;
}
//! Geometry helper
......
Markdown is supported
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