Merge branch 'master' into refactor-immutable
Dave Rolsky [Sun, 22 Mar 2009 14:00:58 +0000 (09:00 -0500)]
Conflicts:

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

1  2 
lib/Class/MOP.pm
lib/Class/MOP/Class.pm
lib/Class/MOP/Immutable.pm
xt/pod_coverage.t

Simple merge
Simple merge
@@@ -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 {
@@@ -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