X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMouse%2FMeta%2FAttribute.pm;h=479c43c945ca0203c5363fe0fb73989d0fe3037a;hb=2b9094e8e533f1635eae1481eef711828f521508;hp=e0473a9fb82427b2de90c778f8ef63daa6c38a04;hpb=32af3489ac653966a8ec8df63bec882585c73676;p=gitmo%2FMouse.git

diff --git a/lib/Mouse/Meta/Attribute.pm b/lib/Mouse/Meta/Attribute.pm
index e0473a9..479c43c 100644
--- a/lib/Mouse/Meta/Attribute.pm
+++ b/lib/Mouse/Meta/Attribute.pm
@@ -2,9 +2,10 @@
 package Mouse::Meta::Attribute;
 use strict;
 use warnings;
+require overload;
 
 use Carp 'confess';
-use Mouse::Util qw/blessed weaken/;
+require Mouse::Util;
 
 sub new {
     my $class = shift;
@@ -99,7 +100,7 @@ sub generate_accessor {
         $accessor .= $self.'->{'.$key.'} = '.$value.';' . "\n";
 
         if ($is_weak) {
-            $accessor .= 'weaken('.$self.'->{'.$key.'}) if ref('.$self.'->{'.$key.'});' . "\n";
+            $accessor .= 'Mouse::Util::weaken('.$self.'->{'.$key.'}) if ref('.$self.'->{'.$key.'});' . "\n";
         }
 
         if ($trigger) {
@@ -300,10 +301,10 @@ sub find_type_constraint {
 
     return unless $type;
 
-    my $checker = Mouse::TypeRegistry->optimized_constraints($self->associated_class->name)->{$type};
+    my $checker = Mouse::TypeRegistry->optimized_constraints()->{$type};
     return $checker if $checker;
 
-    return sub { blessed($_) && blessed($_) eq $type };
+    return sub { Mouse::Util::blessed($_) && Mouse::Util::blessed($_) eq $type };
 }
 
 sub verify_type_constraint {