Author: chromatic
Date: Mon Apr 30 13:49:28 2007
New Revision: 18359
Modified:
trunk/src/inter_call.c
trunk/src/thread.c
trunk/src/tsq.c
Log:
More C++-compatibility casting cleanups.
There are still a few warnings when compiling with optimizations, but src/*.c
is fairly clean now.
Modified: trunk/src/inter_call.c
==============================================================================
--- trunk/src/inter_call.c (original)
+++ trunk/src/inter_call.c Mon Apr 30 13:49:28 2007
@@ -1346,7 +1346,7 @@
int max_regs[8] = { 0, 0, 0, 0, 0, 0, 0, 0 };
int seen_arrow = 0;
const char *x;
- const char *ret_x;
+ const char *ret_x = NULL;
int index = -1;
int cur = 0;
Modified: trunk/src/thread.c
==============================================================================
--- trunk/src/thread.c (original)
+++ trunk/src/thread.c Mon Apr 30 13:49:28 2007
@@ -780,7 +780,8 @@
cur = queue->head;
while (cur) {
- ev = cur->data;
+ ev = (parrot_event *)cur->data;
+
if (ev->type == EVENT_TYPE_SUSPEND_FOR_GC)
break;
Modified: trunk/src/tsq.c
==============================================================================
--- trunk/src/tsq.c (original)
+++ trunk/src/tsq.c Mon Apr 30 13:49:28 2007
@@ -204,11 +204,12 @@
return;
}
- prev = NULL;
- event = entry->data;
+ prev = NULL;
+ event = (parrot_event *)entry->data;
abs_time = event->u.timer_event.abs_time;
+
while (cur && cur->type == QUEUE_ENTRY_TYPE_TIMED_EVENT) {
- const parrot_event * const cur_event = cur->data;
+ const parrot_event * const cur_event = (parrot_event *)cur->data;
if (abs_time > cur_event->u.timer_event.abs_time) {
prev = cur;
cur = cur->next;