Merge branch 'master' into topic/cmop-merge

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

diff --git a/lib/Moose/Exporter.pm b/lib/Moose/Exporter.pm
index 0f40570..7adffda 100644 (file)
--- a/lib/Moose/Exporter.pm
+++ b/lib/Moose/Exporter.pm
@@ -3,7 +3,14 @@ package Moose::Exporter;
 use strict;
 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 );
@@ -12,10 +19,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 {