From: Dave Rolsky <autarch@urth.org>
Date: Tue, 6 Sep 2011 04:11:39 +0000 (-0500)
Subject: merge Meta method classes up to CMOP
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=refs%2Fheads%2Ftopic%2Fmoose-cmop-merge;p=gitmo%2FMoose.git

merge Meta method classes up to CMOP
---

diff --git a/lib/Class/MOP/Method/Meta.pm b/lib/Class/MOP/Method/Meta.pm
index 980afe7..f272484 100644
--- a/lib/Class/MOP/Method/Meta.pm
+++ b/lib/Class/MOP/Method/Meta.pm
@@ -14,7 +14,7 @@ use base 'Class::MOP::Method';
 sub _is_caller_mop_internal {
     my $self = shift;
     my ($caller) = @_;
-    return $caller =~ /^(?:Class::MOP|metaclass)(?:::|$)/;
+    return $caller =~ /^(?:Class::MOP|metaclass|Moose)(?:::|$)/;
 }
 
 sub _generate_meta_method {
diff --git a/lib/Moose/Meta/Method/Meta.pm b/lib/Moose/Meta/Method/Meta.pm
index 9512856..522f326 100644
--- a/lib/Moose/Meta/Method/Meta.pm
+++ b/lib/Moose/Meta/Method/Meta.pm
@@ -4,26 +4,7 @@ package Moose::Meta::Method::Meta;
 use strict;
 use warnings;
 
-use base 'Moose::Meta::Method',
-         'Class::MOP::Method::Meta';
-
-sub _is_caller_mop_internal {
-    my $self = shift;
-    my ($caller) = @_;
-    return 1 if $caller =~ /^Moose(?:::|$)/;
-    return $self->SUPER::_is_caller_mop_internal($caller);
-}
-
-# XXX: ugh multiple inheritance
-sub wrap {
-    my $class = shift;
-    return $class->Class::MOP::Method::Meta::wrap(@_);
-}
-
-sub _make_compatible_with {
-    my $self = shift;
-    return $self->Class::MOP::Method::Meta::_make_compatible_with(@_);
-}
+use base 'Class::MOP::Method::Meta', 'Moose::Meta::Method';
 
 1;