Changeset 4409 for trunk/psLib/src/collections/psVector.h

Timestamp:

Jun 28, 2005, 10:17:52 AM (21 years ago)

Author:

drobbin

Message:

updated files in accordance with requested revisions in apidelta-report-cycle6

File:

• trunk/psLib/src/collections/psVector.h (modified) (6 diffs)

trunk/psLib/src/collections/psVector.h

@@ -11 +11 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.36 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-06-21 03:01:37 $
+ *  @version $Revision: 1.37 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-06-28 20:17:52 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -29 +29 @@
 ///< Union of psVector data types.
 typedef union {
-    psU8* U8;               ///< Unsigned 8-bit integer data.
-    psU16* U16;             ///< Unsigned 16-bit integer data.
-    psU32* U32;             ///< Unsigned 32-bit integer data.
-    psU64* U64;             ///< Unsigned 64-bit integer data.
-    psS8* S8;               ///< Signed 8-bit integer data.
-    psS16* S16;             ///< Signed 16-bit integer data.
-    psS32* S32;             ///< Signed 32-bit integer data.
-    psS64* S64;             ///< Signed 64-bit integer data.
-    psF32* F32;             ///< Single-precision float data.
-    psF64* F64;             ///< Double-precision float data.
-    psC32* C32;             ///< Single-precision complex data.
-    psC64* C64;             ///< Double-precision complex data.
-} p_psVectorData;
+    psU8* U8;                          ///< Unsigned 8-bit integer data.
+    psU16* U16;                        ///< Unsigned 16-bit integer data.
+    psU32* U32;                        ///< Unsigned 32-bit integer data.
+    psU64* U64;                        ///< Unsigned 64-bit integer data.
+    psS8* S8;                          ///< Signed 8-bit integer data.
+    psS16* S16;                        ///< Signed 16-bit integer data.
+    psS32* S32;                        ///< Signed 32-bit integer data.
+    psS64* S64;                        ///< Signed 64-bit integer data.
+    psF32* F32;                        ///< Single-precision float data.
+    psF64* F64;                        ///< Double-precision float data.
+    psC32* C32;                        ///< Single-precision complex data.
+    psC64* C64;                        ///< Double-precision complex data.
+}
+p_psVectorData;
 
 /** An vector to support primitive types.
@@ -50 +51 @@
 typedef struct
 {
-    psType type;                ///< Type of data.
-    int n;                      ///< Number of elements in use.
-    const int nalloc;           ///< Total number of elements available.
-    p_psVectorData data;        ///< Union for data types.
+    psType type;                       ///< Type of data.
+    int n;                             ///< Number of elements in use.
+    const int nalloc;                  ///< Total number of elements available.
+    p_psVectorData data;               ///< Union for data types.
 }
 psVector;
@@ -72 +73 @@
  */
 psVector* psVectorAlloc(
-    psU32 nalloc,               ///< Total number of elements to make available.
-    psElemType dataType                ///< Type of data to be held by vector.
+    unsigned long nalloc,              ///< Total number of elements to make available.
+    psElemType type                    ///< Type of data to be held by vector.
 );
 
@@ -86 +87 @@
  */
 psVector* psVectorRealloc(
-    psVector* psVec,                   ///< Vector to reallocate.
-    psU32 nalloc                       ///< Total number of elements to make available.
+    psVector* vector,                  ///< Vector to reallocate.
+    unsigned long nalloc               ///< Total number of elements to make available.
 );
 
@@ -115 +116 @@
  */
 psVector* psVectorRecycle(
-    psVector* psVec,
+    psVector* vector,
     ///< Vector to recycle.  If NULL, a new vector is created.  No effort
     ///< taken to preserve the values.
 
-    psU32 nalloc,                      ///< Total number of elements to make available.
+    unsigned long nalloc,              ///< Total number of elements to make available.
     psElemType type                    ///< the datatype of the returned vector
 );