diff --git a/Mesh/DivideAndConquer.cpp b/Mesh/DivideAndConquer.cpp index a3156f438f5c70417579df1f903570f846ef5eb0..7a8d7763dd5a19652dbeaef79605f95635e06928 100644 --- a/Mesh/DivideAndConquer.cpp +++ b/Mesh/DivideAndConquer.cpp @@ -1,4 +1,4 @@ -// $Id: DivideAndConquer.cpp,v 1.11 2008-01-19 22:06:03 geuzaine Exp $ +// $Id: DivideAndConquer.cpp,v 1.12 2008-01-22 19:54:04 geuzaine Exp $ // // Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle // @@ -40,6 +40,9 @@ #include "DivideAndConquer.h" #include "Malloc.h" +#define Pred(x) ((x)->prev) +#define Succ(x) ((x)->next) + static PointRecord *pPointArray; int Insert(PointNumero a, PointNumero b); diff --git a/Numeric/NumericEmbedded.h b/Numeric/NumericEmbedded.h index 091af663b078bfbd81d619c615cc8ee70fc034bf..a7ad1eab2534c5818c3f1ae441140c5c0bd8b866 100644 --- a/Numeric/NumericEmbedded.h +++ b/Numeric/NumericEmbedded.h @@ -22,11 +22,8 @@ #include <math.h> -#define RADTODEG 57.295779513082321 -#define RacineDeDeux 1.4142135623730950 -#define RacineDeTrois 1.7320508075688773 -#define Pi 3.1415926535897932 -#define Deux_Pi 6.2831853071795865 +#define Pi 3.1415926535897932 +#define Deux_Pi 6.2831853071795865 #if !defined(M_PI) #define M_PI Pi @@ -49,13 +46,8 @@ #define DSQR SQR #define FSQR SQR -#define THRESHOLD(a,b,c) (((a)>(c))?(c):((a)<(b)?(b):(a))) - #define myhypot(a,b) (sqrt((a)*(a)+(b)*(b))) #define sign(x) (((x)>=0)?1:-1) -#define Pred(x) ((x)->prev) -#define Succ(x) ((x)->next) -#define square(x) ((x)*(x)) double myatan2(double a, double b); double myasin(double a);