From: Fuji, Goro <gfuji@cpan.org>
Date: Mon, 27 Sep 2010 05:39:08 +0000 (+0900)
Subject: Merge remote branch 'origin/master' into merge-0.74
X-Git-Tag: 0.75~2
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=145d67894adb93b4aa067e88b914fc83a5a3533c;p=gitmo%2FMouse.git

Merge remote branch 'origin/master' into merge-0.74

Conflicts:
	lib/Mouse/Meta/Method/Constructor.pm
---

145d67894adb93b4aa067e88b914fc83a5a3533c
diff --cc lib/Mouse/Meta/Method/Constructor.pm
index 4c362f5,e641611..c74d359
--- a/lib/Mouse/Meta/Method/Constructor.pm
+++ b/lib/Mouse/Meta/Method/Constructor.pm
@@@ -13,11 -15,11 +15,10 @@@ sub _generate_constructor 
  
      my $buildall      = $class->_generate_BUILDALL($metaclass);
      my $buildargs     = $class->_generate_BUILDARGS($metaclass);
 -    my $initializer   = $metaclass->{_initialize_object} ||= do {
 +    my $initializer   = $metaclass->{_mouse_cache}{_initialize_object} ||=
         $class->_generate_initialize_object($metaclass);
- 
-     my $source = sprintf(<<'EOT', __LINE__, __FILE__, $metaclass->name, $buildargs, $buildall);
- #line %d %s
 -    };
+     my $source = sprintf(<<'EOT', __FILE__, $metaclass->name, $buildargs, $buildall);
+ #line 1 "%s"
          package %s;
          sub {
              my $class = shift;