From 6fbeaf2cefaf9e56416f1453f4b8bac8f1f3f46c Mon Sep 17 00:00:00 2001 From: Steve Hay Date: Fri, 24 Jan 2014 09:02:59 +0000 Subject: [PATCH] Upgrade Scalar-List-Utils from version 1.37 to 1.38 --- Porting/Maintainers.pl | 2 +- cpan/Scalar-List-Utils/ListUtil.xs | 15 ++------------- cpan/Scalar-List-Utils/lib/List/Util.pm | 2 +- cpan/Scalar-List-Utils/lib/List/Util/XS.pm | 2 +- cpan/Scalar-List-Utils/lib/Scalar/Util.pm | 2 +- pod/perldelta.pod | 6 ++++++ 6 files changed, 12 insertions(+), 17 deletions(-) diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl index 010325d..72703d5 100755 --- a/Porting/Maintainers.pl +++ b/Porting/Maintainers.pl @@ -976,7 +976,7 @@ use File::Glob qw(:case); }, 'Scalar-List-Utils' => { - 'DISTRIBUTION' => 'PEVANS/Scalar-List-Utils-1.37.tar.gz', + 'DISTRIBUTION' => 'PEVANS/Scalar-List-Utils-1.38.tar.gz', 'FILES' => q[cpan/Scalar-List-Utils], }, diff --git a/cpan/Scalar-List-Utils/ListUtil.xs b/cpan/Scalar-List-Utils/ListUtil.xs index 2add2ac..2055193 100644 --- a/cpan/Scalar-List-Utils/ListUtil.xs +++ b/cpan/Scalar-List-Utils/ListUtil.xs @@ -66,18 +66,6 @@ my_sv_copypv(pTHX_ SV *const dsv, SV *const ssv) # define croak_no_modify() croak("%s", PL_no_modify) #endif -#if PERL_VERSION < 12 -static void Perl_ck_warner(pTHX_ U32 err, const char* pat, ...) -{ - if (Perl_ckwarn(aTHX_ err)) { - va_list args; - va_start(args, pat); - vwarner(err, pat, &args); - va_end(args); - } -} -#endif - MODULE=List::Util PACKAGE=List::Util void @@ -951,7 +939,8 @@ CODE: if (!SvROK(sv)) croak("Can't unweaken a nonreference"); else if (!SvWEAKREF(sv)) { - Perl_ck_warner(aTHX_ packWARN(WARN_MISC), "Reference is not weak"); + if(ckWARN(WARN_MISC)) + warn("Reference is not weak"); return; } else if (SvREADONLY(sv)) croak_no_modify(); diff --git a/cpan/Scalar-List-Utils/lib/List/Util.pm b/cpan/Scalar-List-Utils/lib/List/Util.pm index 3c5f19b..76b31be 100644 --- a/cpan/Scalar-List-Utils/lib/List/Util.pm +++ b/cpan/Scalar-List-Utils/lib/List/Util.pm @@ -14,7 +14,7 @@ our @EXPORT_OK = qw( all any first min max minstr maxstr none notall product reduce sum sum0 shuffle pairmap pairgrep pairfirst pairs pairkeys pairvalues ); -our $VERSION = "1.37"; +our $VERSION = "1.38"; our $XS_VERSION = $VERSION; $VERSION = eval $VERSION; diff --git a/cpan/Scalar-List-Utils/lib/List/Util/XS.pm b/cpan/Scalar-List-Utils/lib/List/Util/XS.pm index 3aa3f7a..32c1097 100644 --- a/cpan/Scalar-List-Utils/lib/List/Util/XS.pm +++ b/cpan/Scalar-List-Utils/lib/List/Util/XS.pm @@ -2,7 +2,7 @@ package List::Util::XS; use strict; use List::Util; -our $VERSION = "1.37"; # FIXUP +our $VERSION = "1.38"; # FIXUP $VERSION = eval $VERSION; # FIXUP 1; diff --git a/cpan/Scalar-List-Utils/lib/Scalar/Util.pm b/cpan/Scalar-List-Utils/lib/Scalar/Util.pm index 247d4ea..4ab67f9 100644 --- a/cpan/Scalar-List-Utils/lib/Scalar/Util.pm +++ b/cpan/Scalar-List-Utils/lib/Scalar/Util.pm @@ -16,7 +16,7 @@ our @EXPORT_OK = qw( dualvar isdual isvstring looks_like_number openhandle readonly set_prototype tainted ); -our $VERSION = "1.37"; +our $VERSION = "1.38"; $VERSION = eval $VERSION; our @EXPORT_FAIL; diff --git a/pod/perldelta.pod b/pod/perldelta.pod index 7cc963d..ade1de1 100644 --- a/pod/perldelta.pod +++ b/pod/perldelta.pod @@ -125,6 +125,12 @@ XXX =item * +L has been upgraded from version 1.37 to 1.38. + +A backwards-compatibility issue with older perls has been fixed. [cpan #92363] + +=item * + L has been upgraded from version 1.21 to 1.22. C<< use warnings "FATAL"; >> now implies C<< "all" >>, and similarly -- 2.7.4