[Gridflow-cvs] [svn] commit: r3225 - /trunk/base/number.c

gridflow-cvs at artengine.ca gridflow-cvs at artengine.ca
Fri Mar 14 12:12:42 EDT 2008


Author: matju
Date: Fri Mar 14 12:12:41 2008
New Revision: 3225

Log:
delete old code

Modified:
    trunk/base/number.c

Modified: trunk/base/number.c
==============================================================================
--- trunk/base/number.c (original)
+++ trunk/base/number.c Fri Mar 14 12:12:41 2008
@@ -127,16 +127,7 @@
 	gfmemcopy((uint8 *)as, (uint8 *)bs, n*sizeof(T));
 }
 
-#define Plex std::complex
-/*
-template <class T> struct Plex {
-	T x; // real
-	T y; // imaginary
-	typedef T _T;
-	Plex(T x_, T y_) : x(x_), y(y_) {}
-	Plex operator -(Plex &r) {return Plex(x-r.x,y-r.y);}
-};
-*/
+typedef std::complex Plex;
 
 // classic two-input operator
 
@@ -266,10 +257,6 @@
 #endif
 #ifdef PASS4
 
-//!!! replace by the real thing with DEF_VOP
-#define U (typeof(a.x))
-#define NORM (b.x*b.x+b.y*b.y)
-
 template <class T> inline T gf_sqrt(T a) {return (T)floor(sqrt( a));}
 inline        float32 gf_sqrt(float32 a) {return          sqrtf(a) ;}
 inline        float64 gf_sqrt(float64 a) {return          sqrt( a) ;}
@@ -299,8 +286,6 @@
 DEF_OP(cx_tanh, tanh(a-b),  0, false, false)
 DEF_OP(cx_exp,  exp(a-b),   0, false, false)
 DEF_OP(cx_log,  log(a-b),   0, false, false)
-#undef U
-#undef NORM
 #endif
 
 extern Numop      op_table1[], op_table2[], op_table3[], op_table4[];



More information about the Gridflow-cvs mailing list