Fixes to let us build on C++. Patch courtesy of NotFound++.

rakudo · May 4, 2009 · d86c014 · d86c014
1 parent 5ea5aad
commit d86c014
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/ops/perl6.ops b/src/ops/perl6.ops
@@ -117,8 +117,8 @@ inline op find_lex_lift(out PMC, in STR) :base_core {
     $1 = PMCNULL;
 
     while (ctx->outer_ctx) {
-        const Parrot_Context   * const outer   = ctx->outer_ctx;
-        PMC                    * const lex_pad = outer->lex_pad;
+        Parrot_Context   * const outer   = ctx->outer_ctx;
+        PMC              * const lex_pad = outer->lex_pad;
 
         if (!PMC_IS_NULL(lex_pad) && VTABLE_exists_keyed_str(interp, lex_pad, $2)) {
             $1 = VTABLE_get_pmc_keyed_str(interp, lex_pad, $2);
@@ -181,7 +181,7 @@ inline op is_uprop(out INT, in STR, in STR, in INT) :base_core {
     /* try property */
     strwhich = u_getPropertyEnum(cstr);
     if (strwhich != UCHAR_INVALID_CODE) {
-        $1 = (u_hasBinaryProperty(ord, strwhich) != 0);
+        $1 = (u_hasBinaryProperty(ord, (UProperty) strwhich) != 0);
         Parrot_str_free_cstring(cstr);
         goto NEXT();
     }

diff --git a/src/pmc/objectref_pmc.template b/src/pmc/objectref_pmc.template
@@ -102,7 +102,7 @@ pmclass ObjectRef need_ext dynpmc group perl6_group {
         return VTABLE_does(INTERP, value, role);
     }
 
-    VTABLE void morph(INTVAL type) {
+    VTABLE void morph(PMC *type) {
         /* XXX For now silently do nothing - so copy op on us works. */
     }