X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2Fbase.pm;h=c6d8cca4a78fad00ee3197c3ba60ddc1dce448b0;hb=2b57143f77d879f4dcd705a4df5013117f3a2929;hp=cb5840e660d3cc65d10e01d2763d4d12eff61e98;hpb=f30a114324770080b9e0b2bcfb9c2278f5e0a290;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/lib/base.pm b/lib/base.pm
index cb5840e..c6d8cca 100644
--- a/lib/base.pm
+++ b/lib/base.pm
@@ -30,7 +30,7 @@ C<require>s them.  Whether to C<require> a base class package is
 determined by the absence of a global $VERSION in the base package.
 If $VERSION is not detected even after loading it, <base> will
 define $VERSION in the base package, setting it to the string
-C<-1, defined by base.pm>.
+C<-1, set by base.pm>.
 
 =head1 HISTORY
 
@@ -43,8 +43,9 @@ L<fields>
 =cut
 
 package base;
-use vars qw($VERSION);
-$VERSION = "1.01";
+
+use 5.006_001;
+our $VERSION = "1.02";
 
 sub import {
     my $class = shift;
@@ -54,7 +55,8 @@ sub import {
     foreach my $base (@_) {
 	next if $pkg->isa($base);
 	push @{"$pkg\::ISA"}, $base;
-	unless (exists ${"$base\::"}{VERSION}) {
+        my $vglob;
+	unless (${*{"$base\::VERSION"}{SCALAR}}) {
 	    eval "require $base";
 	    # Only ignore "Can't locate" errors from our eval require.
 	    # Other fatal errors (syntax etc) must be reported.
@@ -66,7 +68,7 @@ sub import {
 			    "which defines that package first.)");
 	    }
 	    ${"$base\::VERSION"} = "-1, set by base.pm"
-		unless exists ${"$base\::"}{VERSION};
+		unless ${*{"$base\::VERSION"}{SCALAR}};
 	}
 
 	# A simple test like (defined %{"$base\::FIELDS"}) will