From: Dave Rolsky <autarch@houseabsolute.urth.org>
Date: Sun, 22 Mar 2009 14:00:58 +0000 (-0500)
Subject: Merge branch 'master' into refactor-immutable
X-Git-Tag: 0.78_02~12
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=a6639567245e276edaf04dc202d77129ed2119a3;p=gitmo%2FClass-MOP.git

Merge branch 'master' into refactor-immutable

Conflicts:

	lib/Class/MOP/Immutable.pm
	lib/Class/MOP/Instance.pm
	lib/Class/MOP/Method/Constructor.pm
	xt/pod_coverage.t
---

a6639567245e276edaf04dc202d77129ed2119a3
diff --cc lib/Class/MOP/Immutable.pm
index 5f4b00a,41fa4ea..f4edaf5
--- a/lib/Class/MOP/Immutable.pm
+++ b/lib/Class/MOP/Immutable.pm
@@@ -141,9 -183,7 +141,7 @@@ sub _inline_destructor 
          name         => 'DESTROY'
      );
  
-     return unless $destructor->is_needed;
- 
 -    $metaclass->add_method( 'DESTROY' => $destructor )
 +    $self->metaclass->add_method( 'DESTROY' => $destructor );
  }
  
  sub _check_memoized_methods {
diff --cc xt/pod_coverage.t
index bf70646,7850e2d..38aadce
--- a/xt/pod_coverage.t
+++ b/xt/pod_coverage.t
@@@ -46,12 -46,19 +46,18 @@@ my %trustme = 
  
      ],
  
 -    'Class::MOP::Immutable' => [
 -        qw( create_immutable_metaclass
 -            create_methods_for_immutable_metaclass
 -            make_metaclass_immutable
 -            make_metaclass_mutable )
 +    'Class::MOP::Instance' => [
 +        qw( BUILDARGS
 +            bless_instance_structure
 +            is_dependent_on_superclasses ),
      ],
  
+     'Class::MOP::Instance' => [
+         qw( BUILDARGS
+             bless_instance_structure
+             is_dependent_on_superclasses ),
+     ],
+ 
      'Class::MOP::Method::Accessor' => [
          qw( generate_accessor_method
              generate_accessor_method_inline