Skip to content
Snippets Groups Projects
Commit fde80622 authored by Christophe Geuzaine's avatar Christophe Geuzaine
Browse files

fix gcc warnings + disable BDS optimization for now (it leads to wrong
results with gcc 4; maybe we should have more intelligent tests in
configure or in the makefiles to enable/disable optimization depending
on which compiler is used)
parent 9c4effc5
No related branches found
No related tags found
No related merge requests found
No preview for this file type
......@@ -51,7 +51,7 @@ class BDS_Metric
const double target,_min,_max,treshold, beta;
const double nb_elements_per_radius_of_curvature;
BDS_Metric ( double _target , double _mmin, double _mmax, double _b, double cc, double _tres = 0.7)
: target(_target),_min(_mmin),_max(_mmax), beta(_b),treshold(_tres),nb_elements_per_radius_of_curvature(cc)
: target(_target),_min(_mmin),_max(_mmax),treshold(_tres),beta(_b),nb_elements_per_radius_of_curvature(cc)
{}
inline double update_target_length( double _target, double old_target_length ) const
{
......@@ -480,6 +480,7 @@ public:
BDS_Point *o[3];
f1->getNodes (n);
f2->getNodes (o);
n[3] = 0; //for stupid gcc warning
if(o[0] != n[0] && o[0] != n[1] &&o[0] != n[2])n[3] = o[0];
if(o[1] != n[0] && o[1] != n[1] &&o[1] != n[2])n[3] = o[1];
if(o[2] != n[0] && o[2] != n[1] &&o[2] != n[2])n[3] = o[2];
......
# $Id: Makefile,v 1.97 2005-09-21 18:09:20 geuzaine Exp $
# $Id: Makefile,v 1.98 2005-11-03 02:39:24 geuzaine Exp $
#
# Copyright (C) 1997-2005 C. Geuzaine, J.-F. Remacle
#
......@@ -93,6 +93,9 @@ ${LIB}: ${OBJ}
# Don't optimize 3D_Mesh: it sometimes mysteriously crashes on Linux
3D_Mesh.o:
${CXX} ${FLAGS} ${INCLUDE} -c $<
# Don't optimize BDS: it leads to erroneous results with gcc 4.0
BDS.o:
${CXX} ${FLAGS} ${INCLUDE} -c $<
clean:
rm -f *.o
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment