X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=blobdiff_plain;f=lib%2FCatalyst%2FUtils.pm;h=76b8262ff10397d225e770fdde6166949f31e5e9;hp=245c7892d6459216f4dfa5ce80aea9f1f4a18275;hb=e7399d8baa841cb6525daa2c20d88f70ba42474c;hpb=71952d604a7cd31491639b7428331be7f70be46e diff --git a/lib/Catalyst/Utils.pm b/lib/Catalyst/Utils.pm index 245c789..76b8262 100644 --- a/lib/Catalyst/Utils.pm +++ b/lib/Catalyst/Utils.pm @@ -7,7 +7,7 @@ use Path::Class; use URI; use Carp qw/croak/; use Cwd; -use Class::MOP; +use Class::Load 'is_class_loaded'; use String::RewritePrefix; use namespace::clean; @@ -297,7 +297,7 @@ sub ensure_class_loaded { # if it already has symbol table entries. This is to support things like Schema::Loader, which # part-generate classes in memory, but then also load some of their contents from disk. return if !$opts->{ ignore_loaded } - && Class::MOP::is_class_loaded($class); # if a symbol entry exists we don't load again + && is_class_loaded($class); # if a symbol entry exists we don't load again # this hack is so we don't overwrite $@ if the load did not generate an error my $error; @@ -312,7 +312,7 @@ sub ensure_class_loaded { die $error if $error; warn "require $class was successful but the package is not defined." - unless Class::MOP::is_class_loaded($class); + unless is_class_loaded($class); return 1; }