X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=src%2FVector.h;h=2dc91d316d88adf045d7ab9e2785e0ea4f375f72;hb=HEAD;hp=0f3ef588cb378da81522bd73bcc477ddbea8f8d4;hpb=e45132acdb58c076d5e06849fa51c26de9a7486d;p=cgds.git diff --git a/src/Vector.h b/src/Vector.h index 0f3ef58..2dc91d3 100644 --- a/src/Vector.h +++ b/src/Vector.h @@ -18,7 +18,7 @@ * @brief Generic resizable array. */ typedef struct Vector { - void** datas; ///< Data array of fixed length (reallocated if needed). + void* datas; ///< Data array of fixed length (reallocated if needed). size_t dataSize; ///< Size in bytes of a vector element. UInt size; ///< Count elements in the vector. UInt capacity; ///< Current maximal capacity; always larger than size. @@ -46,9 +46,7 @@ Vector* _vector_new( * Usage: Vector* vector_new( type) */ #define vector_new(type) \ -{ \ - _vector_new(sizeof(type)); \ -} + _vector_new(sizeof(type)) /** * @brief Copy constructor (shallow copy, ok for basic types). @@ -96,8 +94,8 @@ void _vector_push( */ #define vector_push(vector, data) \ { \ - typeof((data)) tmp = data; \ - _vector_push(vector,&tmp); \ + typeof(data) tmp = data; \ + _vector_push(vector, &tmp); \ } /** @@ -148,8 +146,8 @@ void _vector_set( */ #define vector_set(vector, index, data) \ { \ - typeof((data)) tmp = data; \ - _vector_set(vector,index,&tmp); \ + typeof(data) tmp = data; \ + _vector_set(vector, index, &tmp); \ } /** @@ -175,7 +173,7 @@ void vector_destroy( */ typedef struct VectorIterator { Vector* vector; ///< Vector to be iterated. - void** current; ///< Current vector element. + void* current; ///< Current vector element. } VectorIterator; /** @@ -243,8 +241,8 @@ void _vectorI_set( */ #define vectorI_set(vectorI, data) \ { \ - typeof((data)) tmp = data; \ - _vectorI_set(vectorI,&tmp); \ + typeof(data) tmp = data; \ + _vectorI_set(vectorI, &tmp); \ } /**