Changeset 12431 for trunk/psLib/src/sys

Timestamp:

Mar 13, 2007, 2:39:51 PM (20 years ago)

Author:

Paul Price

Message:

Removing complex number support. No-one was using it, and it prevents compilation on Solaris.

File:

• trunk/psLib/src/sys/psType.h (modified) (9 diffs)

trunk/psLib/src/sys/psType.h

@@ -10 +10 @@
 *  @author Ross Harman, MHPCC
 *
-*  @version $Revision: 1.56 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2007-02-08 01:59:28 $
+*  @version $Revision: 1.57 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2007-03-14 00:39:51 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -22 +22 @@
 /// @{
 
-#include <complex.h>
 #include <stdint.h>
 #include <float.h>
@@ -50 +49 @@
 typedef float psF32;                   ///< 32-bit floating point
 typedef double psF64;                  ///< 64-bit floating point
-
-#ifdef SWIG
-/** 32-bit complex value */
-typedef struct
-{
-    float re, im;
-}
-psC32;
-
-
-/** 64-bit complex value */
-typedef struct
-{
-    double re,im;
-}
-psC64;
-
-
-#else // SWIG
-typedef float complex psC32;          ///< complex with 32-bit floating point Real and Imagary numbers
-typedef double complex psC64;         ///< complex with 64-bit floating point Real and Imagary numbers
-#endif // !SWIG
-
 typedef char* psString;                ///< string value
 typedef void* psPtr;                   ///< void pointer
+
 // XXX psBool can't be removed until all macros that 'generate' this type are
 // fixed -JH
@@ -98 +75 @@
     PS_TYPE_F32  = 0x0404,             ///< Single-precision Floating point.
     PS_TYPE_F64  = 0x0408,             ///< Double-precision floating point.
-    PS_TYPE_C32  = 0x0808,             ///< Complex numbers consisting of single-precision floating point.
-    PS_TYPE_C64  = 0x0810,             ///< Complex numbers consisting of double-precision floating point.
     PS_TYPE_BOOL = 0x1301              ///< Boolean.
 } psElemType;
@@ -170 +145 @@
 #define PS_MIN_F32       -FLT_MAX      /**< minimum valid psF32 value */
 #define PS_MIN_F64       -DBL_MAX      /**< minimum valid psF64 value */
-#define PS_MIN_C32       -FLT_MAX      /**< minimum valid real or imaginary psC32 value */
-#define PS_MIN_C64       -DBL_MAX      /**< minimum valid real or imaginary psC32 value */
 
 #define PS_MAX_S8        INT8_MAX      /**< maximum valid psS8 value */
@@ -183 +156 @@
 #define PS_MAX_F32       FLT_MAX       /**< maximum valid psF32 value */
 #define PS_MAX_F64       DBL_MAX       /**< maximum valid psF64 value */
-#define PS_MAX_C32       FLT_MAX       /**< maximum valid real or imaginary psC32 value */
-#define PS_MAX_C64       DBL_MAX       /**< maximum valid real or imaginary psC32 value */
 
 #define PS_TYPE_BOOL_NAME "psBool"
@@ -197 +168 @@
 #define PS_TYPE_F32_NAME  "psF32"
 #define PS_TYPE_F64_NAME  "psF64"
-#define PS_TYPE_C32_NAME  "psC32"
-#define PS_TYPE_C64_NAME  "psC64"
 
 #define PS_TYPE_NAME(value,type) \
@@ -234 +203 @@
 case PS_TYPE_F64: \
     value = PS_TYPE_F64_NAME; \
-    break; \
-case PS_TYPE_C32: \
-    value = PS_TYPE_C32_NAME; \
-    break; \
-case PS_TYPE_C64: \
-    value = PS_TYPE_C64_NAME; \
     break; \
 default: \
@@ -261 +224 @@
 /// Macro to determine if the psElemType is unsigned.
 #define PS_IS_PSELEMTYPE_UNSIGNED(x) ((x & 0x200) == 0x200)
-/// Macro to determine if the psElemType is a real (non-complex) floating-point type.
+/// Macro to determine if the psElemType is a real floating-point type.
 #define PS_IS_PSELEMTYPE_REAL(x) ((x & 0x400) == 0x400)
-/// Macro to determine if the psElemType is complex number type.
-#define PS_IS_PSELEMTYPE_COMPLEX(x) ((x & 0x800) == 0x800)
 /// Macro to determine if the psElemType is boolean type.
 #define PS_IS_PSELEMTYPE_BOOL(x) ((x & 0x1000) == 0x1000)