[svn:parrot] r49634 - in branches/generational_gc/src: gc io

[mikehh at svn.parrot.org]

Author: mikehh
Date: Fri Oct 22 03:04:49 2010
New Revision: 49634
URL: https://trac.parrot.org/parrot/changeset/49634

Log:
[generational_gc] some casts to get g++ to build

Modified:
   branches/generational_gc/src/gc/gc_ms2.c
   branches/generational_gc/src/io/buffer.c

Modified: branches/generational_gc/src/gc/gc_ms2.c
==============================================================================
--- branches/generational_gc/src/gc/gc_ms2.c	Fri Oct 22 02:31:12 2010	(r49633)
+++ branches/generational_gc/src/gc/gc_ms2.c	Fri Oct 22 03:04:49 2010	(r49634)
@@ -759,7 +759,7 @@
                     LIST_REMOVE(self->objects[i], tmp);
                     LIST_APPEND(self->objects[i+1], tmp);
 
-                    gc_ms2_set_gen_flags(interp, pmc, i+1);
+                    gc_ms2_set_gen_flags(interp, (PObj *)pmc, i+1);
                 }
             }
 
@@ -777,7 +777,7 @@
 
             if (PObj_live_TEST(pmc)) {
                 gc_ms2_seal_object(interp, pmc);
-                gc_ms2_set_gen_flags(interp, pmc, 2);
+                gc_ms2_set_gen_flags(interp, (PObj *)pmc, 2);
             }
 
             tmp = next;
@@ -962,7 +962,7 @@
     if (PObj_constant_TEST(s))
         return;
 
-    PARROT_ASSERT(pobj2gen(s) == self->current_generation);
+    PARROT_ASSERT(pobj2gen((PMC *)s) == self->current_generation);
 }
 
 /*

Modified: branches/generational_gc/src/io/buffer.c
==============================================================================
--- branches/generational_gc/src/io/buffer.c	Fri Oct 22 02:31:12 2010	(r49633)
+++ branches/generational_gc/src/io/buffer.c	Fri Oct 22 03:04:49 2010	(r49634)
@@ -342,9 +342,10 @@
             STRING *sf = Parrot_str_new_init(interp, NULL, len,
                 Parrot_default_encoding_ptr,
                 PObj_external_FLAG);
-            sf->_bufstart = sf->strstart = s->_bufstart;
-            got                 = PIO_READ(interp, filehandle, &sf);
-            s->strlen           = s->bufused = current + got;
+            sf->_bufstart = s->_bufstart;
+            sf->strstart  = (char *)s->_bufstart;
+            got           = PIO_READ(interp, filehandle, &sf);
+            s->strlen     = s->bufused = current + got;
 
             Parrot_io_set_file_position(interp, filehandle,
                     (got + Parrot_io_get_file_position(interp, filehandle)));