Merged CMOP into Moose

[gitmo/Moose.git] / lib / Moose / Exporter.pm

diff --git a/lib/Moose/Exporter.pm b/lib/Moose/Exporter.pm
index 0f40570..15a918c 100644 (file)
--- a/lib/Moose/Exporter.pm
+++ b/lib/Moose/Exporter.pm
@@ -5,6 +5,15 @@ use warnings;
 
 our $AUTHORITY = 'cpan:STEVAN';
 
+use XSLoader;
+
+BEGIN {
+    XSLoader::load(
+        'Moose',
+        $Moose::{VERSION} ? $Moose::{VERSION} : ()
+    );
+}
+
 use Class::MOP;
 use List::MoreUtils qw( first_index uniq );
 use Moose::Util::MetaRole;
@@ -12,10 +21,6 @@ use Scalar::Util qw(reftype);
 use Sub::Exporter 0.980;
 use Sub::Name qw(subname);
 
-use XSLoader;
-
-XSLoader::load( 'Moose', $XS_VERSION );
-
 my %EXPORT_SPEC;
 
 sub setup_import_methods {