Index: trunk/psLib/src/collections/psVector.h =================================================================== --- trunk/psLib/src/collections/psVector.h (revision 645) +++ trunk/psLib/src/collections/psVector.h (revision 661) @@ -19,6 +19,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.1 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-05-12 18:07:22 $ + * @version $Revision: 1.2 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-05-13 19:28:35 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -47,16 +47,17 @@ */ typedef enum { - PS_TYPE_CHAR, ///< Character. - PS_TYPE_SHORT, ///< Short integer. - PS_TYPE_INT, ///< Integer. - PS_TYPE_LONG, ///< Long integer. - PS_TYPE_UCHAR, ///< Unsigned character. - PS_TYPE_USHORT, ///< Unsigned short integer. - PS_TYPE_UINT, ///< Unsigned integer. - PS_TYPE_ULONG, ///< Unsigned long integer. - PS_TYPE_FLOAT, ///< Floating point. - PS_TYPE_DOUBLE, ///< Double-precision floating point. - PS_TYPE_COMPLEX, ///< Complex numbers consisting of floating point. - PS_TYPE_OTHER, ///< Something else that's not supported for arithmetic. + PS_TYPE_INT8, ///< Character. + PS_TYPE_INT16, ///< Short integer. + PS_TYPE_INT32, ///< Integer. + PS_TYPE_INT64, ///< Long integer. + PS_TYPE_UINT8, ///< Unsigned character. + PS_TYPE_UINT16, ///< Unsigned short integer. + PS_TYPE_UINT32, ///< Unsigned integer. + PS_TYPE_UINT64, ///< Unsigned long integer. + PS_TYPE_FLOAT, ///< Single-precision Floating point. + PS_TYPE_DOUBLE, ///< Double-precision floating point. + PS_TYPE_COMPLEX_FLOAT, ///< Complex numbers consisting of single-precision floating point. + PS_TYPE_COMPLEX_DOUBLE, ///< Complex numbers consisting of double-precision floating point. + PS_TYPE_OTHER, ///< Something else that's not supported for arithmetic. } psElemType; @@ -94,22 +95,22 @@ typedef struct { - psType type; ///< Type of data. - int nalloc; ///< Total number of elements available. - int n; ///< Number of elements in use. + psType type; ///< Type of data. + unsigned int nalloc; ///< Total number of elements available. + unsigned int n; ///< Number of elements in use. union { - char *c; ///< Pointers to char integer data. - short *s; ///< Pointers to short integer data. - int *i; ///< Pointers to integer data. - long *l; ///< Pointers to long integer data. - unsigned char *uc; ///< Pointers to unsigned char integer data. - unsigned short *us; ///< Pointers to unsigned short integer data. - unsigned int *ui; ///< Pointers to unsigned integer data. - unsigned long *ul; ///< Pointers to unsigned long integer data. - float *f; ///< Pointers to floating point data. - double *d; ///< Pointers to double precision data. - complex float *cf; ///< Pointers to complex floating point data. - void **vp; ///< Void pointer vector. - }vec; ///< Union for data types. + int8_t *i8; ///< Pointers to char integer data. + int16_t *i16; ///< Pointers to short integer data. + int32_t *i32; ///< Pointers to integer data. + int64_t *i64; ///< Pointers to long integer data. + uint8_t *ui8; ///< Pointers to unsigned char integer data. + uint16_t*ui16; ///< Pointers to unsigned short integer data. + uint32_t *ui32; ///< Pointers to unsigned integer data. + uint64_t *ui64; ///< Pointers to unsigned long integer data. + float *f; ///< Pointers to floating point data. + double *d; ///< Pointers to double precision data. + complex float *cf; ///< Pointers to complex floating point data. + void **vp; ///< Void pointer vector. + }vec; ///< Union for data types. } psVector; @@ -127,6 +128,6 @@ */ psVector *psVectorAlloc( - psType type, ///< Type of data to be held by vector. - int nalloc ///< Total number of elements to make available. + psType type, ///< Type of data to be held by vector. + unsigned int nalloc ///< Total number of elements to make available. ); @@ -134,5 +135,5 @@ * * Uses psLib memory allocation functions to reallocate a vector collection of data. The vector is reallocated - * according to the psType type member contained within the vector. + * according to the psType type member contained within the vector. * * @return psVector*: Pointer to psVector. @@ -140,6 +141,6 @@ */ psVector *psVectorRealloc( - psVector *restrict psVec, ///< Vector to reallocate. - int nalloc ///< Total number of elements to make available. + psVector *restrict psVec, ///< Vector to reallocate. + unsigned int nalloc ///< Total number of elements to make available. ); @@ -147,5 +148,5 @@ * * Uses psLib memory allocation functions to deallocate a vector collection of data. The vector is deallocated - * according to the psType type member contained within the vector. + * according to the psType type member contained within the vector. * * @return psVector*: Pointer to psVector. @@ -165,11 +166,11 @@ */ psVector *psVoidPtrVectorAlloc( - int nalloc ///< Number of elements to use. + unsigned int nalloc ///< Number of elements to use. ); /** Reallocate a void pointer vector. * - * Uses psLib memory allocation functions to reallocate a vector of void pointers as defined by the - * psVoidPtrVector struct. If the vector size is increased or decreased, this function does not allocate or + * Uses psLib memory allocation functions to reallocate a vector of void pointers as defined by the + * psVoidPtrVector struct. If the vector size is increased or decreased, this function does not allocate or * deallocate the contents of individual vector elements. The user must do this after calling this function. * @@ -178,14 +179,14 @@ */ psVector *psVoidPtrVectorRealloc( - psVector *restrict psVec, ///< Void pointer vector to destroy. - int nalloc ///< Number of elements. + psVector *restrict psVec, ///< Void pointer vector to destroy. + unsigned int nalloc ///< Number of elements. ); /** Deallocate a void pointer vector. * - * Uses psLib memory allocation functions to deallocate a vector of void pointers as defined by the - * psVoidPtrVector struct. This function does not free the vector elements unless the user provides a callback - * function. NULL may be passed as an alternative to supplying a callback, but the user must remember to - * delete the vector elements afterwards. The user must not delete or deallocate the vector elements prior to + * Uses psLib memory allocation functions to deallocate a vector of void pointers as defined by the + * psVoidPtrVector struct. This function does not free the vector elements unless the user provides a callback + * function. NULL may be passed as an alternative to supplying a callback, but the user must remember to + * delete the vector elements afterwards. The user must not delete or deallocate the vector elements prior to * calling this function, as it requires valid elements for memory reference decrementation operations. *