Changeset: da3338a66be9 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=da3338a66be9
Modified Files:
MonetDB5/src/mal/mal_interpreter.mx
Branch: Oct2010
Log Message:
fixed compilation:
MonetDB5/src/mal/mal_interpreter.mx: In function ‘q_create’
MonetDB5/src/mal/mal_interpreter.mx:870: error: ‘queue’ has no member named ‘sz’
MonetDB5/src/mal/mal_interpreter.mx: In function ‘q_enqueue’:
MonetDB5/src/mal/mal_interpreter.mx:898: error: invalid application of ‘sizeof’
to a void type
MonetDB5/src/mal/mal_interpreter.mx: In function ‘q_requeue’:
MonetDB5/src/mal/mal_interpreter.mx:913: error: invalid application of ‘sizeof’
to a void type
diffs (30 lines):
diff -r f2e6d362c3f0 -r da3338a66be9 MonetDB5/src/mal/mal_interpreter.mx
--- a/MonetDB5/src/mal/mal_interpreter.mx Fri Dec 03 21:45:26 2010 +0100
+++ b/MonetDB5/src/mal/mal_interpreter.mx Fri Dec 03 23:11:49 2010 +0100
@@ -867,7 +867,7 @@
return NULL;
q->size = ((sz<<1)>>1); /* we want a multiple of 2 */
q->last = 0;
- q->data = (void*)GDKmalloc(sizeof(void*)*q->sz);
+ q->data = (void*)GDKmalloc(sizeof(void*)*q->size);
if ( q->data == NULL){
GDKfree(q);
return NULL;
@@ -895,7 +895,7 @@
if (q->last == q->size) {
/* enlarge buffer */
q->size <<= 1;
- q->data = GDKrealloc(q->data, sizeof(void)*q->size);
+ q->data = GDKrealloc(q->data, sizeof(void*)*q->size);
}
q->data[q->last++] = d;
MT_unset_lock(q->l, "q_enqueue");
@@ -910,7 +910,7 @@
if (q->last == q->size) {
/* enlarge buffer */
q->size <<= 1;
- q->data = GDKrealloc(q->data, sizeof(void)*q->size);
+ q->data = GDKrealloc(q->data, sizeof(void*)*q->size);
}
for ( i=q->last; i > 0; i--)
q->data[i]= q->data[i-1];
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
