Stop calling class data methods on instances + commented out warning

[catagits/Catalyst-Runtime.git] / lib / Catalyst / ClassData.pm

diff --git a/lib/Catalyst/ClassData.pm b/lib/Catalyst/ClassData.pm
index 553a851..9942840 100644 (file)
--- a/lib/Catalyst/ClassData.pm
+++ b/lib/Catalyst/ClassData.pm
@@ -1,19 +1,20 @@
 package Catalyst::ClassData;
 
 use Moose::Role;
+use Moose::Meta::Class ();
 use Class::MOP;
-use Class::MOP::Object;
+use Moose::Util ();
 
 sub mk_classdata {
-  my ($class, $attribute) = @_;
+  my ($class, $attribute, $warn_on_instance) = @_;
   confess("mk_classdata() is a class method, not an object method")
     if blessed $class;
 
   my $slot = '$'.$attribute;
   my $accessor =  sub {
     my $pkg = ref $_[0] || $_[0];
-    # Hack - delberately create a metaclass instance
-    my $meta = $pkg->Class::MOP::Object::meta();
+    my $meta = Moose::Util::find_meta($pkg)
+        || Moose::Meta::Class->initialize( $pkg );
     if (@_ > 1) {
       $meta->namespace->{$attribute} = \$_[1];
       return $_[1];
@@ -82,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