The return value of setlocale must be copied away.

[p5sagit/p5-mst-13.2.git] / lib / base.pm

diff --git a/lib/base.pm b/lib/base.pm
index b8d210e..3cb42f5 100644 (file)
--- a/lib/base.pm
+++ b/lib/base.pm
@@ -52,21 +52,14 @@ sub import {
     my $fields_base;
     my $pkg = caller(0);
 
-    my @attrs;
-    my $isa = \@{"$pkg\::ISA"};
-
     foreach my $base (@_) {
-        if ($base =~ /^[-+]/) { #attribute
-            push @attrs, $base;
-            next;
-        }
        next if $pkg->isa($base);
-       push @$isa, $base;
+       push @{"$pkg\::ISA"}, $base;
        unless (exists ${"$base\::"}{VERSION}) {
            eval "require $base";
            # Only ignore "Can't locate" errors from our eval require.
            # Other fatal errors (syntax etc) must be reported.
-           die if $@ && $@ !~ /^Can\'t locate .*? at \(eval /;
+           die if $@ && $@ !~ /^Can't locate .*? at \(eval /;
            unless (%{"$base\::"}) {
                require Carp;
                Carp::croak("Base class package \"$base\" is empty.\n",
@@ -94,10 +87,6 @@ sub import {
        require fields;
        fields::inherit($pkg, $fields_base);
     }
-    if (@attrs) {
-        require attributes;
-        attributes::->import($pkg, $isa, @attrs);
-    }
 }
 
 1;