[svn:parrot] r46046 - in trunk/src: io pmc

[NotFound at svn.parrot.org]

Author: NotFound
Date: Mon Apr 26 22:22:13 2010
New Revision: 46046
URL: https://trac.parrot.org/parrot/changeset/46046

Log:
fix an error and a warning in c++ mode

Modified:
   trunk/src/io/buffer.c
   trunk/src/pmc/callcontext.pmc

Modified: trunk/src/io/buffer.c
==============================================================================
--- trunk/src/io/buffer.c	Mon Apr 26 20:58:55 2010	(r46045)
+++ trunk/src/io/buffer.c	Mon Apr 26 22:22:13 2010	(r46046)
@@ -337,7 +337,7 @@
         size_t got;
 
         if (len >= Parrot_io_get_buffer_size(interp, filehandle)) {
-            STRING *sf = Parrot_str_new_init(interp, out_buf, len,
+            STRING *sf = Parrot_str_new_init(interp, (char *)out_buf, len,
                 PARROT_DEFAULT_ENCODING, PARROT_DEFAULT_CHARSET,
                 PObj_external_FLAG);
             got                 = PIO_READ(interp, filehandle, &sf);

Modified: trunk/src/pmc/callcontext.pmc
==============================================================================
--- trunk/src/pmc/callcontext.pmc	Mon Apr 26 20:58:55 2010	(r46045)
+++ trunk/src/pmc/callcontext.pmc	Mon Apr 26 22:22:13 2010	(r46046)
@@ -749,7 +749,7 @@
                     case STRINGCELL: type = enum_type_STRING;   break;
                     case PMCCELL:
                         type = PMC_IS_NULL(c[i].u.p)
-                             ? enum_type_PMC
+                             ? (INTVAL) enum_type_PMC
                              : VTABLE_type(interp, c[i].u.p);
                         break;
                     default: