From: Lukas Mai <l.mai@web.de>
Date: Wed, 14 Nov 2012 14:16:45 +0000 (+0100)
Subject: Merge branch 'metadata' into mooseish-types
X-Git-Tag: v1.00_02~4
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=75d7dde2a12774ed3b1fac4b017dd336e444043e;hp=5cf69cd2971747fcdf9118fcfdf5b6d1869ad508;p=p5sagit%2FFunction-Parameters.git

Merge branch 'metadata' into mooseish-types
---

diff --git a/Parameters.xs b/Parameters.xs
index ba28c0e..9343ffe 100644
--- a/Parameters.xs
+++ b/Parameters.xs
@@ -1037,7 +1037,7 @@ static void register_info(pTHX_ UV key, SV *declarator, const KWSpec *kws, const
 		size_t n;
 		char *p = SvPV(declarator, n);
 		char *q = memchr(p, ' ', n);
-		mPUSHp(p, q ? q - p : n);
+		mPUSHp(p, q ? (size_t)(q - p) : n);
 	}
 	if (!ps) {
 		if (SvTRUE(kws->shift)) {
@@ -2035,12 +2035,12 @@ UV
 fp__cv_root(sv)
 	SV * sv
 	PREINIT:
-		CV *cv;
+		CV *xcv;
 		HV *hv;
 		GV *gv;
 	CODE:
-		cv = sv_2cv(sv, &hv, &gv, 0);
-		RETVAL = PTR2UV(cv ? CvROOT(cv) : NULL);
+		xcv = sv_2cv(sv, &hv, &gv, 0);
+		RETVAL = PTR2UV(xcv ? CvROOT(xcv) : NULL);
 	OUTPUT:
 		RETVAL