X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FClassData.pm;h=f252f05eeba37d7eea06ab6f889fed63b956c489;hb=829b22f766b0b1d1a09a6ce152abe48ad9bde5ec;hp=41bfaa1d9b7b77b2dbe3d695e4a1432a1e5b3fe3;hpb=67837eb659c6b7bc46c2d7efd70b555324c305c3;p=catagits%2FCatalyst-Runtime.git

diff --git a/lib/Catalyst/ClassData.pm b/lib/Catalyst/ClassData.pm
index 41bfaa1..f252f05 100644
--- a/lib/Catalyst/ClassData.pm
+++ b/lib/Catalyst/ClassData.pm
@@ -1,6 +1,7 @@
 package Catalyst::ClassData;
 
 use Moose::Role;
+use Moose::Meta::Class ();
 use Class::MOP;
 use Moose::Util ();
 
@@ -12,8 +13,8 @@ sub mk_classdata {
   my $slot = '$'.$attribute;
   my $accessor =  sub {
     my $pkg = ref $_[0] || $_[0];
-    my $meta = Moose::Util::find_meta($pkg) 
-        || Moose->init_meta( for_class => $pkg );
+    my $meta = Moose::Util::find_meta($pkg)
+        || Moose::Meta::Class->initialize( $pkg );
     if (@_ > 1) {
       $meta->namespace->{$attribute} = \$_[1];
       return $_[1];
@@ -44,17 +45,18 @@ sub mk_classdata {
     unless ref $accessor eq 'CODE';
 
   my $meta = $class->Class::MOP::Object::meta();
-  my $immutable_options;
-  if( $meta->is_immutable ){
-    $immutable_options = $meta->get_immutable_options;
-    $meta->make_mutable;
-  }
+  confess "${class}'s metaclass is not a Class::MOP::Class"
+    unless $meta->isa('Class::MOP::Class');
+
+  my $was_immutable = $meta->is_immutable;
+  $meta->make_mutable if $was_immutable;
+
   my $alias = "_${attribute}_accessor";
   $meta->add_method($alias, $accessor);
   $meta->add_method($attribute, $accessor);
-  if(defined $immutable_options){
-    $meta->make_immutable(%{ $immutable_options });
-  }
+
+  $meta->make_immutable if $was_immutable;
+
   $class->$attribute($_[2]) if(@_ > 2);
   return $accessor;
 }
@@ -81,7 +83,7 @@ Guillermo Roditi
 
 =head1 COPYRIGHT
 
-This program is free software, you can redistribute it and/or modify it under
+This library is free software. You can redistribute it and/or modify it under
 the same terms as Perl itself.
 
 =cut