Bump version requirement for MX::Emulate::CAF to the new release which fixes the...

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

diff --git a/lib/Catalyst/AttrContainer.pm b/lib/Catalyst/AttrContainer.pm
index ddfe0ab..764c460 100644 (file)
--- a/lib/Catalyst/AttrContainer.pm
+++ b/lib/Catalyst/AttrContainer.pm
@@ -1,22 +1,14 @@
 package Catalyst::AttrContainer;
 
 use Moose;
-#use strict;
-#use base qw/Class::Accessor::Fast Class::Data::Inheritable/;
-
 use Catalyst::Exception;
-use NEXT;
+use Scalar::Util 'blessed';
+with 'Catalyst::ClassData';
 
-#dont want to ISA a C::D::I
-use Class::Data::Inheritable;
-{
-  my $mk_classdata = Class::Data::Inheritable->can('mk_classdata');
-  __PACKAGE__->meta->add_method(mk_classdata => $mk_classdata);
-}
+no Moose;
 
-__PACKAGE__->mk_classdata($_) for qw/_attr_cache _action_cache/;
-__PACKAGE__->_attr_cache( {} );
-__PACKAGE__->_action_cache( [] );
+__PACKAGE__->mk_classdata(_attr_cache => {} );
+__PACKAGE__->mk_classdata( _action_cache => [] );
 
 # note - see attributes(3pm)
 sub MODIFY_CODE_ATTRIBUTES {
@@ -37,7 +29,7 @@ Catalyst::AttrContainer
 
 =head1 DESCRIPTION
 
-This class sets up the code attribute cache.  It's a base class for
+This class sets up the code attribute cache.  It's a base class for 
 L<Catalyst::Controller>.
 
 =head1 METHODS