X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FClassData.pm;h=3882ccd4da4eca0bd47fa290468b1445399a1423;hb=74c89dead3cfd8e95cbe853adbc6fe9eed539f4e;hp=2b004122bb2186f1672bd23c198cb7bc1ac79b7c;hpb=875d811063ef237d5cc41e9258fdbf1b567e403d;p=catagits%2FCatalyst-Runtime.git diff --git a/lib/Catalyst/ClassData.pm b/lib/Catalyst/ClassData.pm index 2b00412..3882ccd 100644 --- a/lib/Catalyst/ClassData.pm +++ b/lib/Catalyst/ClassData.pm @@ -2,6 +2,7 @@ package Catalyst::ClassData; use Moose::Role; use Class::MOP; +use Class::MOP::Object; use Scalar::Util 'blessed'; sub mk_classdata { @@ -11,9 +12,9 @@ sub mk_classdata { my $slot = '$'.$attribute; my $accessor = sub { - my $meta = $_[0]->meta; my $pkg = ref $_[0] || $_[0]; - if(@_ > 1){ + my $meta = $pkg->Class::MOP::Object::meta(); + if (@_ > 1){ $meta->namespace->{$attribute} = \$_[1]; return $_[1]; } @@ -42,7 +43,7 @@ sub mk_classdata { confess("Failed to create accessor: $@ ") unless ref $accessor eq 'CODE'; - my $meta = $class->meta; + my $meta = $class->Class::MOP::Object::meta(); my $immutable_options; if( $meta->is_immutable ){ $immutable_options = $meta->get_immutable_options;