diff options
author | Steve Hay <steve.m.hay@googlemail.com> | 2014-01-24 09:02:59 +0000 |
---|---|---|
committer | Steve Hay <steve.m.hay@googlemail.com> | 2014-01-24 09:02:59 +0000 |
commit | 6fbeaf2cefaf9e56416f1453f4b8bac8f1f3f46c (patch) | |
tree | 5e354735537a4d5d81e7e6a7f699bb2de0a8f574 /cpan/Scalar-List-Utils | |
parent | 02091bd7ebe469aca7283c42a3c537b2c15079db (diff) | |
download | perl-6fbeaf2cefaf9e56416f1453f4b8bac8f1f3f46c.tar.gz |
Upgrade Scalar-List-Utils from version 1.37 to 1.38
Diffstat (limited to 'cpan/Scalar-List-Utils')
-rw-r--r-- | cpan/Scalar-List-Utils/ListUtil.xs | 15 | ||||
-rw-r--r-- | cpan/Scalar-List-Utils/lib/List/Util.pm | 2 | ||||
-rw-r--r-- | cpan/Scalar-List-Utils/lib/List/Util/XS.pm | 2 | ||||
-rw-r--r-- | cpan/Scalar-List-Utils/lib/Scalar/Util.pm | 2 |
4 files changed, 5 insertions, 16 deletions
diff --git a/cpan/Scalar-List-Utils/ListUtil.xs b/cpan/Scalar-List-Utils/ListUtil.xs index 2add2ac694..20551930e9 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 3c5f19bb14..76b31be3c2 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 3aa3f7a75e..32c10972aa 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 247d4ea21e..4ab67f9aa0 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; |