X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=blobdiff_plain;f=lib%2FCatalyst%2FClassData.pm;fp=lib%2FCatalyst%2FClassData.pm;h=cc90c0655b2ebb7738137709973c862f3685a223;hp=553a8511f0fd873e95b654e80960ceab41bd513b;hb=bafb7fb41dd4cbc70fc18a173841cebf850f5b35;hpb=0a0c74aae1b56a3d4c60c92bfbeeb6cc649418fc

diff --git a/lib/Catalyst/ClassData.pm b/lib/Catalyst/ClassData.pm
index 553a851..cc90c06 100644
--- a/lib/Catalyst/ClassData.pm
+++ b/lib/Catalyst/ClassData.pm
@@ -2,7 +2,7 @@ package Catalyst::ClassData;
 
 use Moose::Role;
 use Class::MOP;
-use Class::MOP::Object;
+use Moose::Util ();
 
 sub mk_classdata {
   my ($class, $attribute) = @_;
@@ -12,8 +12,8 @@ sub mk_classdata {
   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->init_meta( for_class => $pkg );
     if (@_ > 1) {
       $meta->namespace->{$attribute} = \$_[1];
       return $_[1];