X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMooseX%2FClassAttribute.pm;h=7306caf64ed8fb05632ea84cd4fe1c5d058cb936;hb=e1bb560144e7ec7173ab5196f661a3b629323300;hp=5ea8829a1926a1ae2ae00c9d9cd08ecbeec3ea1c;hpb=fab23ffc5e4893382308bf2dbd84556e48df0b03;p=gitmo%2FMooseX-ClassAttribute.git

diff --git a/lib/MooseX/ClassAttribute.pm b/lib/MooseX/ClassAttribute.pm
index 5ea8829..7306caf 100644
--- a/lib/MooseX/ClassAttribute.pm
+++ b/lib/MooseX/ClassAttribute.pm
@@ -69,10 +69,11 @@ sub process_class_attribute ## no critic RequireArgUnpacking
             unless grep { $_->isa('Moose::Object') } @parents;
 
         my $container_pkg = 'MooseX::ClassAttribute::Container::' . $caller;
+        my $instance_holder = $container_pkg . '::Self';
 
         my $instance_meth = sub {
             no strict 'refs'; ## no critic ProhibitNoStrict
-            return ${ $container_pkg . '::Self' } ||= shift->new(@_);
+            return $$instance_holder ||= shift->new(@_);
         };
 
         my $class =
@@ -141,7 +142,7 @@ MooseX::ClassAttribute - Declare class attributes Moose-style
         );
 
     __PACKAGE__->meta()->make_immutable();
-    MooseX::ClassAttribute::containing_class()->meta()->make_immutable();
+    MooseX::ClassAttribute::container_class()->meta()->make_immutable();
 
     no Moose;
     no MooseX::ClassAttribute;
@@ -193,10 +194,10 @@ for which you're creating class attributes. You don't need to worry
 about this too much, except when it comes to making a class immutable.
 
 Since the class attributes are not really stored in your class, you
-need to make the containing class immutable as well as your own ...
+need to make the container class immutable as well as your own ...
 
   __PACKAGE__->meta()->make_immutable();
-  MooseX::ClassAttribute::containing_class()->meta()->make_immutable();
+  MooseX::ClassAttribute::container_class()->meta()->make_immutable();
 
 I<This may change in the future!>