Changeset 1ba5803 for src/tests/vector

Timestamp:

Nov 22, 2017, 5:06:06 PM (8 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

8dceeb7

Parents:

f203a7a (diff), 4d5e57b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'fix-bug-51'

File:

• src/tests/vector/vector_int.c (modified) (4 diffs)

src/tests/vector/vector_int.c

@@ -27 +27 @@
         vec.last = -1;
         vec.capacity = reserve;
-        vec.data = malloc( sizeof( int ) * reserve );
+        vec.data = (int *)malloc( sizeof( int ) * reserve );
 }
 
@@ -33 +33 @@
         vec.last = other.last;
         vec.capacity = other.capacity;
-        vec.data = malloc( sizeof( int ) * other.capacity );
+        vec.data = (int *)malloc( sizeof( int ) * other.capacity );
         for (int i = 0; i < vec.last; i++) {
                 vec.data[i] = other.data[i];
@@ -45 +45 @@
 void reserve( vector_int *vec, int reserve ) {
         if ( reserve > vec->capacity ) {
-                vec->data = realloc( vec->data, sizeof( int ) * reserve );
+                vec->data = (int *)realloc( vec->data, sizeof( int ) * reserve );
                 vec->capacity = reserve;
         }
@@ -54 +54 @@
         if ( vec->last == vec->capacity ) {
                 vec->capacity *= 2;
-                vec->data = realloc( vec->data, sizeof( int ) * vec->capacity );
+                vec->data = (int *)realloc( vec->data, sizeof( int ) * vec->capacity );
         }
         vec->data[ vec->last ] = element;