Change 34646 by [EMAIL PROTECTED] on 2008/10/29 21:36:17
As Perl_cv_const_sv() now takes a const CV *, use that as the cast for
its arguments.
Affected files ...
... //depot/perl/dump.c#314 edit
... //depot/perl/pp.c#633 edit
... //depot/perl/sv.c#1564 edit
Differences ...
==== //depot/perl/dump.c#314 (text) ====
Index: perl/dump.c
--- perl/dump.c#313~34642~ 2008-10-29 13:39:43.000000000 -0700
+++ perl/dump.c 2008-10-29 14:36:17.000000000 -0700
@@ -1805,7 +1805,7 @@
do_op_dump(level+1, file, CvROOT(sv));
}
} else {
- SV * const constant = cv_const_sv((CV *)sv);
+ SV * const constant = cv_const_sv((const CV *)sv);
Perl_dump_indent(aTHX_ level, file, " XSUB = 0x%"UVxf"\n",
PTR2UV(CvXSUB(sv)));
==== //depot/perl/pp.c#633 (text) ====
Index: perl/pp.c
--- perl/pp.c#632~34629~ 2008-10-28 15:14:26.000000000 -0700
+++ perl/pp.c 2008-10-29 14:36:17.000000000 -0700
@@ -809,7 +809,7 @@
hv_undef(MUTABLE_HV(sv));
break;
case SVt_PVCV:
- if (cv_const_sv((CV*)sv) && ckWARN(WARN_MISC))
+ if (cv_const_sv((const CV *)sv) && ckWARN(WARN_MISC))
Perl_warner(aTHX_ packWARN(WARN_MISC), "Constant subroutine %s
undefined",
CvANON((CV*)sv) ? "(anonymous)" : GvENAME(CvGV((CV*)sv)));
/* FALLTHROUGH */
==== //depot/perl/sv.c#1564 (text) ====
Index: perl/sv.c
--- perl/sv.c#1563~34629~ 2008-10-28 15:14:26.000000000 -0700
+++ perl/sv.c 2008-10-29 14:36:17.000000000 -0700
@@ -3522,7 +3522,8 @@
/* Redefining a sub - warning is mandatory if
it was a const and its value changed. */
if (CvCONST(cv) && CvCONST((CV*)sref)
- && cv_const_sv(cv) == cv_const_sv((CV*)sref)) {
+ && cv_const_sv(cv)
+ == cv_const_sv((const CV *)sref)) {
NOOP;
/* They are 2 constant subroutines generated from
the same constant. This probably means that
@@ -3535,7 +3536,8 @@
|| (CvCONST(cv)
&& (!CvCONST((CV*)sref)
|| sv_cmp(cv_const_sv(cv),
- cv_const_sv((CV*)sref))))) {
+ cv_const_sv((const CV *)
+ sref))))) {
Perl_warner(aTHX_ packWARN(WARN_REDEFINE),
(const char *)
(CvCONST(cv)
End of Patch.
