Checking in changes prior to tagging of version 0.59.

[gitmo/Mouse.git] / lib / Mouse / Meta / Role.pm

diff --git a/lib/Mouse/Meta/Role.pm b/lib/Mouse/Meta/Role.pm
index afe6017..56c41b2 100644 (file)
--- a/lib/Mouse/Meta/Role.pm
+++ b/lib/Mouse/Meta/Role.pm
@@ -129,7 +129,8 @@ sub _apply_methods{
 }
 
 sub _apply_attributes{
-    my($role, $consumer, $args) = @_;
+    #my($role, $consumer, $args) = @_;
+    my($role, $consumer) = @_;
 
     for my $attr_name ($role->get_attribute_list) {
         next if $consumer->has_attribute($attr_name);
@@ -140,7 +141,9 @@ sub _apply_attributes{
 }
 
 sub _apply_modifiers{
-    my($role, $consumer, $args) = @_;
+    #my($role, $consumer, $args) = @_;
+    my($role, $consumer) = @_;
+
 
     if(my $modifiers = $role->{override_method_modifiers}){
         foreach my $method_name (keys %{$modifiers}){
@@ -165,7 +168,8 @@ sub _apply_modifiers{
 }
 
 sub _append_roles{
-    my($role, $consumer, $args) = @_;
+    #my($role, $consumer, $args) = @_;
+    my($role, $consumer) = @_;
 
     my $roles = $consumer->{roles};
 
@@ -234,7 +238,7 @@ sub apply {
     if(defined $instance){ # Application::ToInstance
         # rebless instance
         bless $instance, $consumer->name;
-        $consumer->_initialize_object($instance, $instance);
+        $consumer->_initialize_object($instance, $instance, 1);
     }
 
     return;
@@ -242,7 +246,7 @@ sub apply {
 
 
 sub combine {
-    my($role_class, @role_specs) = @_;
+    my($self, @role_specs) = @_;
 
     require 'Mouse/Meta/Role/Composite.pm'; # we don't want to create its namespace
 
@@ -308,7 +312,7 @@ Mouse::Meta::Role - The Mouse Role metaclass
 
 =head1 VERSION
 
-This document describes Mouse version 0.50_06
+This document describes Mouse version 0.59
 
 =head1 SEE ALSO