diff maths/MathAliases.h @ 487:5998ee1042d3

Use M_PI
author Chris Cannam <cannam@all-day-breakfast.com>
date Fri, 31 May 2019 16:33:55 +0100
parents fa407c1d9923
children 701233f8ed41
line wrap: on
line diff
--- a/maths/MathAliases.h	Fri May 31 16:33:46 2019 +0100
+++ b/maths/MathAliases.h	Fri May 31 16:33:55 2019 +0100
@@ -19,17 +19,9 @@
 #include <cmath>
 #include <complex>
 
-using namespace std;
-typedef complex<double> ComplexData;
+#define TWO_PI          (2. * M_PI)
 
-
-#ifndef PI
-#define PI (3.14159265358979232846)
-#endif
-
-#define TWO_PI          (2. * PI)
-
-#define EPS 2.2204e-016
+#define EPS             2.2204e-016
 
 /* aliases to math.h functions */
 #define EXP                             exp
@@ -43,6 +35,8 @@
 #define FLOOR                   floorf
 #define TRUNC                   truncf
 
+typedef std::complex<double> ComplexData;
+
 /* aliases to complex.h functions */
 /** sample = EXPC(complex) */
 #define EXPC                    cexpf