Changeset 6204 for trunk/psLib/src/math/psConstants.h

Timestamp:

Jan 26, 2006, 11:10:22 AM (20 years ago)

Author:

gusciora

Message:

Implemented the polynomial alloc argument changes.

File:

• trunk/psLib/src/math/psConstants.h (modified) (3 diffs)

trunk/psLib/src/math/psConstants.h

@@ -6 +6 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.83 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-01-26 00:31:19 $
+ *  @version $Revision: 1.84 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-01-26 21:10:22 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -512 +512 @@
 static psPolynomial1D *(NAME) = NULL; \
 if ((NAME) == NULL) { \
-    (NAME) = psPolynomial1DAlloc(ORDER, TYPE); \
+    (NAME) = psPolynomial1DAlloc(TYPE, ORDER); \
     p_psMemSetPersistent((NAME), true); \
     p_psMemSetPersistent((NAME)->coeff, true); \
@@ -519 +519 @@
 } \
 
-#define PS_POLY_2D_DECLARE_ALLOC_STATIC(NAME, ORDER, TYPE) \
-static psPolynomial2D *(NAME) = NULL; \
-if ((NAME) == NULL) { \
-    (NAME) = psPolynomial2DAlloc(ORDER, TYPE); \
-    p_psMemSetPersistent((NAME), true); \
-} \
-
-#define PS_POLY_3D_DECLARE_ALLOC_STATIC(NAME, ORDER, TYPE) \
-static psPolynomial3D *(NAME) = NULL; \
-if ((NAME) == NULL) { \
-    (NAME) = psPolynomial3DAlloc(ORDER, TYPE); \
-    p_psMemSetPersistent((NAME), true); \
-} \
-
-#define PS_POLY_4D_DECLARE_ALLOC_STATIC(NAME, ORDER, TYPE) \
-static psPolynomial4D *(NAME) = NULL; \
-if ((NAME) == NULL) { \
-    (NAME) = psPolynomial4DAlloc(ORDER, TYPE); \
-    p_psMemSetPersistent((NAME), true); \
-} \
+/* XXX: This is not correct
+    #define PS_POLY_2D_DECLARE_ALLOC_STATIC(NAME, ORDER, TYPE) \
+    static psPolynomial2D *(NAME) = NULL; \
+    if ((NAME) == NULL) { \
+        (NAME) = psPolynomial2DAlloc(ORDER, TYPE); \
+        p_psMemSetPersistent((NAME), true); \
+    } \
+ 
+    #define PS_POLY_3D_DECLARE_ALLOC_STATIC(NAME, ORDER, TYPE) \
+    static psPolynomial3D *(NAME) = NULL; \
+    if ((NAME) == NULL) { \
+        (NAME) = psPolynomial3DAlloc(ORDER, TYPE); \
+        p_psMemSetPersistent((NAME), true); \
+    } \
+ 
+    #define PS_POLY_4D_DECLARE_ALLOC_STATIC(NAME, ORDER, TYPE) \
+    static psPolynomial4D *(NAME) = NULL; \
+    if ((NAME) == NULL) { \
+        (NAME) = psPolynomial4DAlloc(ORDER, TYPE); \
+        p_psMemSetPersistent((NAME), true); \
+    } \
+*/
 
 #define PS_POLY_1D_D_DECLARE_ALLOC_STATIC(NAME, ORDER, TYPE) \
 static psPolynomial1D *(NAME) = NULL; \
 if ((NAME) == NULL) { \
-    (NAME) = psPolynomial1DAlloc(ORDER, TYPE); \
+    (NAME) = psPolynomial1DAlloc(TYPE, ORDER); \
     p_psMemSetPersistent((NAME), true); \
 } \
 
-#define PS_POLY_2D_D_DECLARE_ALLOC_STATIC(NAME, ORDER, TYPE) \
-static psPolynomial2D *(NAME) = NULL; \
-if ((NAME) == NULL) { \
-    (NAME) = psPolynomial2DAlloc(ORDER, TYPE); \
-    p_psMemSetPersistent((NAME), true); \
-} \
-
-#define PS_POLY_3D_D_DECLARE_ALLOC_STATIC(NAME, ORDER, TYPE) \
-static psPolynomial3D *(NAME) = NULL; \
-if ((NAME) == NULL) { \
-    (NAME) = psPolynomial3DAlloc(ORDER, TYPE); \
-    p_psMemSetPersistent((NAME), true); \
-} \
-
-#define PS_POLY_4D_D_DECLARE_ALLOC_STATIC(NAME, ORDER, TYPE) \
-static psPolynomial4D *(NAME) = NULL; \
-if ((NAME) == NULL) { \
-    (NAME) = psPolynomial4DAlloc(ORDER, TYPE); \
-    p_psMemSetPersistent((NAME), true); \
-} \
+/* XXX: This is not correct
+    #define PS_POLY_2D_D_DECLARE_ALLOC_STATIC(NAME, ORDER, TYPE) \
+    static psPolynomial2D *(NAME) = NULL; \
+    if ((NAME) == NULL) { \
+        (NAME) = psPolynomial2DAlloc(ORDER, TYPE); \
+        p_psMemSetPersistent((NAME), true); \
+    } \
+ 
+    #define PS_POLY_3D_D_DECLARE_ALLOC_STATIC(NAME, ORDER, TYPE) \
+    static psPolynomial3D *(NAME) = NULL; \
+    if ((NAME) == NULL) { \
+        (NAME) = psPolynomial3DAlloc(ORDER, TYPE); \
+        p_psMemSetPersistent((NAME), true); \
+    } \
+ 
+    #define PS_POLY_4D_D_DECLARE_ALLOC_STATIC(NAME, ORDER, TYPE) \
+    static psPolynomial4D *(NAME) = NULL; \
+    if ((NAME) == NULL) { \
+        (NAME) = psPolynomial4DAlloc(ORDER, TYPE); \
+        p_psMemSetPersistent((NAME), true); \
+    } \
+*/
 
 #define PS_POLY_PRINT_1D(NAME) \