diff options
author | Chris 'BinGOs' Williams <chris@bingosnet.co.uk> | 2014-01-21 14:57:36 +0000 |
---|---|---|
committer | Chris 'BinGOs' Williams <chris@bingosnet.co.uk> | 2014-01-21 14:57:36 +0000 |
commit | 568d025de1c93424654d2796e7e1a59b8f4aeb58 (patch) | |
tree | bbd3d063ac27dcea0abd0ce6b8e7fb0482a3c676 /cpan | |
parent | 056e7cc2768cab98e0cbdf0afd32ffbf45bbefc0 (diff) | |
download | perl-568d025de1c93424654d2796e7e1a59b8f4aeb58.tar.gz |
Update Scalar-List-Utils to CPAN version 1.37
[DELTA]
1.37 -- 2014/01/21 14:44:34
[BUGFIXES]
* Fix unweaken() for perls < 5.14; need to use sv_setsv() to undef
rather than sv_clear() (RT92226)
Diffstat (limited to 'cpan')
-rw-r--r-- | cpan/Scalar-List-Utils/ListUtil.xs | 2 | ||||
-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 | ||||
-rw-r--r-- | cpan/Scalar-List-Utils/t/weak.t | 3 |
5 files changed, 6 insertions, 5 deletions
diff --git a/cpan/Scalar-List-Utils/ListUtil.xs b/cpan/Scalar-List-Utils/ListUtil.xs index af869ce4fc..2add2ac694 100644 --- a/cpan/Scalar-List-Utils/ListUtil.xs +++ b/cpan/Scalar-List-Utils/ListUtil.xs @@ -965,7 +965,7 @@ CODE: /* Lacking sv_del_backref() the best we can do is clear the old (weak) ref * then set a new strong one */ - sv_clear(sv); + sv_setsv(sv, &PL_sv_undef); SvRV_set(sv, SvREFCNT_inc_NN(tsv)); SvROK_on(sv); #endif diff --git a/cpan/Scalar-List-Utils/lib/List/Util.pm b/cpan/Scalar-List-Utils/lib/List/Util.pm index 429ad3ee70..3c5f19bb14 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.36"; +our $VERSION = "1.37"; 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 15f581deb9..3aa3f7a75e 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.36"; # FIXUP +our $VERSION = "1.37"; # 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 6b977191df..247d4ea21e 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.36"; +our $VERSION = "1.37"; $VERSION = eval $VERSION; our @EXPORT_FAIL; diff --git a/cpan/Scalar-List-Utils/t/weak.t b/cpan/Scalar-List-Utils/t/weak.t index 266640a4b1..842f3f8662 100644 --- a/cpan/Scalar-List-Utils/t/weak.t +++ b/cpan/Scalar-List-Utils/t/weak.t @@ -17,7 +17,7 @@ BEGIN { use Scalar::Util (); use Test::More ((grep { /weaken/ } @Scalar::Util::EXPORT_FAIL) and !$ENV{PERL_CORE}) ? (skip_all => 'weaken requires XS version') - : (tests => 27); + : (tests => 28); Scalar::Util->import(qw(weaken unweaken isweak)); @@ -143,6 +143,7 @@ my $flag; unweaken($y); + is(ref $y, "SCALAR", '$y is still a SCALAR ref after unweaken()'); ok(!isweak($y), '$y is not weak after unweaken()'); is($$y, "foo", '$y points at \"foo" after unweaken()'); |