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

Timestamp:

Feb 16, 2006, 2:56:48 PM (20 years ago)

Author:

gusciora

Message:

* empty log message *

File:

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

trunk/psLib/src/math/psConstants.h

@@ -6 +6 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.84 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-01-26 21:10:22 $
+ *  @version $Revision: 1.85 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-02-17 00:56:48 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -169 +169 @@
 }
 
-// Return an error if the arg is lies outside the supplied range.
+// Return an error if the arg lies outside the supplied range.
 #define PS_ASSERT_FLOAT_WITHIN_RANGE(NAME, LOWER, UPPER, RVAL) \
 if ((NAME) < (LOWER) || (NAME) > (UPPER)) { \
@@ -186 +186 @@
 }
 
-// Return an error if the arg lies outside the supplied range
 #define PS_ASSERT_LONG_WITHIN_RANGE(NAME, LOWER, UPPER, RVAL) \
 if ((NAME) < (LOWER) || (NAME) > (UPPER)) { \
@@ -519 +518 @@
 } \
 
-/* 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; \
@@ -548 +524 @@
     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) \