X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMoose%2FUtil%2FMetaRole.pm;h=5cb451b2f05b4103a040d6996cfade8edf9b896e;hb=95f64261533cb53bdaade56d3b50a8fa9fb7dcd3;hp=f9d6937d010f2b34ba2b8f50ed23510b0be4ec28;hpb=baf46b9edc7dc3665c7eaf9d1684b157efb09e1a;p=gitmo%2FMoose.git

diff --git a/lib/Moose/Util/MetaRole.pm b/lib/Moose/Util/MetaRole.pm
index f9d6937..5cb451b 100644
--- a/lib/Moose/Util/MetaRole.pm
+++ b/lib/Moose/Util/MetaRole.pm
@@ -3,7 +3,7 @@ package Moose::Util::MetaRole;
 use strict;
 use warnings;
 
-our $VERSION   = '0.72_01';
+our $VERSION   = '0.73';
 $VERSION = eval $VERSION;
 our $AUTHORITY = 'cpan:STEVAN';
 
@@ -16,8 +16,9 @@ sub apply_metaclass_roles {
 
     my $for = $options{for_class};
 
-    my %old_classes
-        = map { $_ => $for->meta->$_ } grep { $for->meta->can($_) } @Classes;
+    my %old_classes = map { $_ => Class::MOP::class_of($for)->$_ }
+                      grep { Class::MOP::class_of($for)->can($_) }
+                      @Classes;
 
     my $meta = _make_new_metaclass( $for, \%options );
 
@@ -42,7 +43,7 @@ sub _make_new_metaclass {
     my $for     = shift;
     my $options = shift;
 
-    return $for->meta()
+    return Class::MOP::class_of($for)
         unless grep { exists $options->{ $_ . '_roles' } }
             qw(
             metaclass
@@ -52,10 +53,9 @@ sub _make_new_metaclass {
             instance_metaclass
     );
 
+    my $old_meta = Class::MOP::class_of($for);
     my $new_metaclass
-        = _make_new_class( ref $for->meta(), $options->{metaclass_roles} );
-
-    my $old_meta = $for->meta();
+        = _make_new_class( ref $old_meta, $options->{metaclass_roles} );
 
     # This could get called for a Moose::Meta::Role as well as a Moose::Meta::Class
     my %classes = map {
@@ -77,7 +77,7 @@ sub apply_base_class_roles {
 
     my $for = $options{for_class};
 
-    my $meta = $for->meta();
+    my $meta = Class::MOP::class_of($for);
 
     my $new_base = _make_new_class(
         $for,