summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ext/B/t/OptreeCheck.pm2
-rw-r--r--ext/B/t/b.t7
-rw-r--r--ext/B/t/terse.t2
-rw-r--r--ext/ExtUtils-Miniperl/lib/ExtUtils/Miniperl.pm8
-rw-r--r--ext/FileCache/lib/FileCache.pm6
-rw-r--r--ext/FileCache/t/01open.t2
-rw-r--r--ext/FileCache/t/02maxopen.t2
-rw-r--r--ext/FileCache/t/03append.t2
-rw-r--r--ext/FileCache/t/06export.t2
-rw-r--r--ext/Hash-Util-FieldHash/t/12_hashwarn.t3
-rw-r--r--ext/POSIX/t/sigaction.t2
-rw-r--r--ext/Pod-Html/lib/Pod/Html.pm9
-rw-r--r--ext/VMS-DCLsym/DCLsym.pm5
-rw-r--r--ext/VMS-Stdio/Stdio.pm13
-rw-r--r--ext/XS-APItest/t/autoload.t10
-rw-r--r--ext/XS-APItest/t/xsub_h.t2
-rw-r--r--ext/XS-Typemap/Typemap.pm6
17 files changed, 36 insertions, 47 deletions
diff --git a/ext/B/t/OptreeCheck.pm b/ext/B/t/OptreeCheck.pm
index b1d23ce0ea..fb215c227b 100644
--- a/ext/B/t/OptreeCheck.pm
+++ b/ext/B/t/OptreeCheck.pm
@@ -2,7 +2,7 @@ package OptreeCheck;
use parent 'Exporter';
use strict;
use warnings;
-use vars qw($TODO $Level $using_open);
+our ($TODO, $Level, $using_open);
require "test.pl";
our $VERSION = '0.16';
diff --git a/ext/B/t/b.t b/ext/B/t/b.t
index 587c8e665f..c976793e29 100644
--- a/ext/B/t/b.t
+++ b/ext/B/t/b.t
@@ -21,7 +21,7 @@ BEGIN { use_ok( 'B' ); }
package Testing::Symtable;
-use vars qw($This @That %wibble $moo %moo);
+our ($This, @That, %wibble, $moo, %moo);
my $not_a_sym = 'moo';
sub moo { 42 }
@@ -35,7 +35,7 @@ package Testing::Symtable::Bar;
sub hock { "yarrow" }
package main;
-use vars qw(%Subs);
+our %Subs;
local %Subs = ();
B::walksymtable(\%Testing::Symtable::, 'find_syms', sub { $_[0] =~ /Foo/ },
'Testing::Symtable::');
@@ -46,8 +46,7 @@ sub B::GV::find_syms {
$main::Subs{$symbol->STASH->NAME . '::' . $symbol->NAME}++;
}
-my @syms = map { 'Testing::Symtable::'.$_ } qw(This That wibble moo car
- BEGIN);
+my @syms = map { 'Testing::Symtable::'.$_ } qw(This That wibble moo car);
push @syms, "Testing::Symtable::Foo::yarrow";
# Make sure we hit all the expected symbols.
diff --git a/ext/B/t/terse.t b/ext/B/t/terse.t
index 26e2e76054..d332f4b9c0 100644
--- a/ext/B/t/terse.t
+++ b/ext/B/t/terse.t
@@ -63,7 +63,7 @@ warn "# didn't find " . join(' ', keys %ops) if keys %ops;
# add it to the regex above too. (PADOPs are currently only produced
# under ithreads, though).
#
-use vars qw( $a $b );
+our ( $a, $b );
sub bar {
# OP SVOP COP IV here or in sub definition
my @bar = (1, 2, 3);
diff --git a/ext/ExtUtils-Miniperl/lib/ExtUtils/Miniperl.pm b/ext/ExtUtils-Miniperl/lib/ExtUtils/Miniperl.pm
index 5d397b1bde..fec33a42c6 100644
--- a/ext/ExtUtils-Miniperl/lib/ExtUtils/Miniperl.pm
+++ b/ext/ExtUtils-Miniperl/lib/ExtUtils/Miniperl.pm
@@ -4,11 +4,9 @@ use strict;
require Exporter;
use ExtUtils::Embed 1.31, qw(xsi_header xsi_protos xsi_body);
-use vars qw($VERSION @ISA @EXPORT);
-
-@ISA = qw(Exporter);
-@EXPORT = qw(writemain);
-$VERSION = '1.06';
+our @ISA = qw(Exporter);
+our @EXPORT = qw(writemain);
+our $VERSION = '1.07';
# blead will run this with miniperl, hence we can't use autodie or File::Temp
my $temp;
diff --git a/ext/FileCache/lib/FileCache.pm b/ext/FileCache/lib/FileCache.pm
index 149e88133e..0834719d9b 100644
--- a/ext/FileCache/lib/FileCache.pm
+++ b/ext/FileCache/lib/FileCache.pm
@@ -1,6 +1,6 @@
package FileCache;
-our $VERSION = '1.09';
+our $VERSION = '1.10';
=head1 NAME
@@ -91,8 +91,8 @@ no strict 'refs';
# These are not C<my> for legacy reasons.
# Previous versions requested the user set $cacheout_maxopen by hand.
# Some authors fiddled with %saw to overcome the clobber on initial open.
-use vars qw(%saw $cacheout_maxopen);
-$cacheout_maxopen = 16;
+our %saw;
+our $cacheout_maxopen = 16;
use parent 'Exporter';
our @EXPORT = qw[cacheout cacheout_close];
diff --git a/ext/FileCache/t/01open.t b/ext/FileCache/t/01open.t
index 07e01bac86..c01b25a424 100644
--- a/ext/FileCache/t/01open.t
+++ b/ext/FileCache/t/01open.t
@@ -2,7 +2,7 @@
use FileCache;
-use vars qw(@files);
+our @files;
BEGIN { @files = qw(foo bar baz quux Foo_Bar) }
END { 1 while unlink @files }
diff --git a/ext/FileCache/t/02maxopen.t b/ext/FileCache/t/02maxopen.t
index 00dbb1bd54..f3470c1086 100644
--- a/ext/FileCache/t/02maxopen.t
+++ b/ext/FileCache/t/02maxopen.t
@@ -1,7 +1,7 @@
#!./perl
use FileCache maxopen => 2;
-use vars qw(@files);
+our @files;
BEGIN { @files = qw(foo bar baz quux) }
END { 1 while unlink @files }
diff --git a/ext/FileCache/t/03append.t b/ext/FileCache/t/03append.t
index f765d445ce..3a82679357 100644
--- a/ext/FileCache/t/03append.t
+++ b/ext/FileCache/t/03append.t
@@ -1,7 +1,7 @@
#!./perl
use FileCache maxopen => 2;
-use vars qw(@files);
+our @files;
BEGIN { @files = qw(foo bar baz quux Foo_Bar) }
END { 1 while unlink @files }
diff --git a/ext/FileCache/t/06export.t b/ext/FileCache/t/06export.t
index 0fafe3bcd6..9a46e2bebb 100644
--- a/ext/FileCache/t/06export.t
+++ b/ext/FileCache/t/06export.t
@@ -1,5 +1,5 @@
#!./perl
-use vars qw(@funcs $i);
+our (@funcs, $i);
BEGIN {
# Functions exported by FileCache;
diff --git a/ext/Hash-Util-FieldHash/t/12_hashwarn.t b/ext/Hash-Util-FieldHash/t/12_hashwarn.t
index 5841c80046..3fd6bfd2dd 100644
--- a/ext/Hash-Util-FieldHash/t/12_hashwarn.t
+++ b/ext/Hash-Util-FieldHash/t/12_hashwarn.t
@@ -7,8 +7,7 @@ use strict;
use warnings;
use Hash::Util::FieldHash qw( :all);
-use vars qw{ @warnings };
-
+our @warnings;
BEGIN {
$SIG{'__WARN__'} = sub { push @warnings, @_ };
$| = 1;
diff --git a/ext/POSIX/t/sigaction.t b/ext/POSIX/t/sigaction.t
index 0bbc4368d4..73c66f9404 100644
--- a/ext/POSIX/t/sigaction.t
+++ b/ext/POSIX/t/sigaction.t
@@ -14,7 +14,7 @@ BEGIN{
use Test::More tests => 36;
use strict;
-use vars qw/$bad $bad7 $ok10 $bad18 $ok/;
+our ( $bad, $bad7, $ok10, $bad18, $ok );
$^W=1;
diff --git a/ext/Pod-Html/lib/Pod/Html.pm b/ext/Pod-Html/lib/Pod/Html.pm
index 5b3463687b..1972a8c2d3 100644
--- a/ext/Pod-Html/lib/Pod/Html.pm
+++ b/ext/Pod-Html/lib/Pod/Html.pm
@@ -2,11 +2,10 @@ package Pod::Html;
use strict;
require Exporter;
-use vars qw($VERSION @ISA @EXPORT @EXPORT_OK);
-$VERSION = 1.2202;
-@ISA = qw(Exporter);
-@EXPORT = qw(pod2html htmlify);
-@EXPORT_OK = qw(anchorify);
+our $VERSION = 1.2203;
+our @ISA = qw(Exporter);
+our @EXPORT = qw(pod2html htmlify);
+our @EXPORT_OK = qw(anchorify);
use Carp;
use Config;
diff --git a/ext/VMS-DCLsym/DCLsym.pm b/ext/VMS-DCLsym/DCLsym.pm
index 6990e2af5a..b00b7bc765 100644
--- a/ext/VMS-DCLsym/DCLsym.pm
+++ b/ext/VMS-DCLsym/DCLsym.pm
@@ -2,12 +2,11 @@ package VMS::DCLsym;
use Carp;
use DynaLoader;
-use vars qw( @ISA $VERSION );
use strict;
# Package globals
-@ISA = ( 'DynaLoader' );
-$VERSION = '1.08';
+our @ISA = ( 'DynaLoader' );
+our $VERSION = '1.09';
my(%Locsyms) = ( ':ID' => 'LOCAL' );
my(%Gblsyms) = ( ':ID' => 'GLOBAL');
my $DoCache = 1;
diff --git a/ext/VMS-Stdio/Stdio.pm b/ext/VMS-Stdio/Stdio.pm
index e692e05b08..02ba8668ed 100644
--- a/ext/VMS-Stdio/Stdio.pm
+++ b/ext/VMS-Stdio/Stdio.pm
@@ -8,18 +8,17 @@
package VMS::Stdio;
require 5.002;
-use vars qw( $VERSION @EXPORT @EXPORT_OK %EXPORT_TAGS @ISA );
use Carp '&croak';
use DynaLoader ();
use Exporter ();
-
-$VERSION = '2.43';
-@ISA = qw( Exporter DynaLoader IO::File );
-@EXPORT = qw( &O_APPEND &O_CREAT &O_EXCL &O_NDELAY &O_NOWAIT
+
+our $VERSION = '2.44';
+our @ISA = qw( Exporter DynaLoader IO::File );
+our @EXPORT = qw( &O_APPEND &O_CREAT &O_EXCL &O_NDELAY &O_NOWAIT
&O_RDONLY &O_RDWR &O_TRUNC &O_WRONLY );
-@EXPORT_OK = qw( &binmode &flush &getname &remove &rewind &sync &setdef &tmpnam
+our @EXPORT_OK = qw( &binmode &flush &getname &remove &rewind &sync &setdef &tmpnam
&vmsopen &vmssysopen &waitfh &writeof );
-%EXPORT_TAGS = ( CONSTANTS => [ qw( &O_APPEND &O_CREAT &O_EXCL &O_NDELAY
+our %EXPORT_TAGS = ( CONSTANTS => [ qw( &O_APPEND &O_CREAT &O_EXCL &O_NDELAY
&O_NOWAIT &O_RDONLY &O_RDWR &O_TRUNC
&O_WRONLY ) ],
FUNCTIONS => [ qw( &binmode &flush &getname &remove &rewind
diff --git a/ext/XS-APItest/t/autoload.t b/ext/XS-APItest/t/autoload.t
index bb670e91b6..b3599b362c 100644
--- a/ext/XS-APItest/t/autoload.t
+++ b/ext/XS-APItest/t/autoload.t
@@ -80,12 +80,12 @@ is join(" ", eval 'a "b", "c"'), '$',
ok(XS::APItest::AUTOLOADtest->can('AUTOLOAD'), 'Test class ->can AUTOLOAD');
# Used to communicate from the XS AUTOLOAD to Perl land
-use vars '$the_method';
+our $the_method;
# First, set up the Perl equivalent to what we're testing in
# XS so we have a comparison
package PerlBase;
-use vars '$AUTOLOAD';
+our $AUTOLOAD;
sub AUTOLOAD {
Test::More::ok(defined $AUTOLOAD);
return 1 if not defined $AUTOLOAD;
@@ -94,12 +94,10 @@ sub AUTOLOAD {
}
package PerlDerived;
-use vars '@ISA';
-@ISA = qw(PerlBase);
+our @ISA = qw(PerlBase);
package Derived;
-use vars '@ISA';
-@ISA = qw(XS::APItest::AUTOLOADtest);
+our @ISA = qw(XS::APItest::AUTOLOADtest);
package main;
diff --git a/ext/XS-APItest/t/xsub_h.t b/ext/XS-APItest/t/xsub_h.t
index e763130525..a7e2541e42 100644
--- a/ext/XS-APItest/t/xsub_h.t
+++ b/ext/XS-APItest/t/xsub_h.t
@@ -5,7 +5,7 @@ use Test::More;
BEGIN { use_ok('XS::APItest') };
-use vars qw($XS_VERSION $VERSION);
+our ($XS_VERSION, $VERSION);
# This is what the code expects
my $real_version = $XS::APItest::VERSION;
diff --git a/ext/XS-Typemap/Typemap.pm b/ext/XS-Typemap/Typemap.pm
index 7877b4a3ab..9871415319 100644
--- a/ext/XS-Typemap/Typemap.pm
+++ b/ext/XS-Typemap/Typemap.pm
@@ -34,11 +34,9 @@ to the test script.
use parent qw/ Exporter /;
require XSLoader;
-use vars qw/ $VERSION @EXPORT /;
+our $VERSION = '0.16';
-$VERSION = '0.15';
-
-@EXPORT = (qw/
+our @EXPORT = (qw/
T_SV
T_SVREF
T_SVREF_REFCOUNT_FIXED
View Lorry Controller Status