From: Rafael Garcia-Suarez <rgarciasuarez@gmail.com>
Date: Tue, 14 Jul 2009 07:41:42 +0000 (+0200)
Subject: Don't preload Carp::Heavy in warnings.pm
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=4dd71923a4816d49eef5a43f9290f38ccae2a776;p=p5sagit%2Fp5-mst-13.2.git

Don't preload Carp::Heavy in warnings.pm

Use only Carp, now that all the machinery is in it.
---

diff --git a/lib/warnings.pm b/lib/warnings.pm
index fb8c02a..a42b662 100644
--- a/lib/warnings.pm
+++ b/lib/warnings.pm
@@ -302,7 +302,7 @@ $All = "" ; vec($All, $Offsets{'all'}, 2) = 3 ;
 
 sub Croaker
 {
-    require Carp::Heavy; # this initializes %CarpInternal
+    require Carp; # this initializes %CarpInternal
     local $Carp::CarpInternal{'warnings'};
     delete $Carp::CarpInternal{'warnings'};
     Carp::croak(@_);
@@ -453,7 +453,7 @@ sub __chk
 }
 
 sub _error_loc {
-    require Carp::Heavy;
+    require Carp;
     goto &Carp::short_error_loc; # don't introduce another stack frame
 }                                                             
 
diff --git a/warnings.pl b/warnings.pl
index c5cdaa8..4d010de 100644
--- a/warnings.pl
+++ b/warnings.pl
@@ -587,7 +587,7 @@ $All = "" ; vec($All, $Offsets{'all'}, 2) = 3 ;
 
 sub Croaker
 {
-    require Carp::Heavy; # this initializes %CarpInternal
+    require Carp; # this initializes %CarpInternal
     local $Carp::CarpInternal{'warnings'};
     delete $Carp::CarpInternal{'warnings'};
     Carp::croak(@_);
@@ -738,7 +738,7 @@ sub __chk
 }
 
 sub _error_loc {
-    require Carp::Heavy;
+    require Carp;
     goto &Carp::short_error_loc; # don't introduce another stack frame
 }