Integrate mainline

[p5sagit/p5-mst-13.2.git] / warnings.pl

diff --git a/warnings.pl b/warnings.pl
index e317b0a..f69c803 100644 (file)
--- a/warnings.pl
+++ b/warnings.pl
@@ -373,9 +373,9 @@ warnings - Perl pragma to control optional warnings
         warnings::warn($object, "some warning");
     }
 
-    warnif("some warning");
-    warnif("void", "some warning");
-    warnif($object, "some warning");
+    warnings::warnif("some warning");
+    warnings::warnif("void", "some warning");
+    warnings::warnif($object, "some warning");
 
 =head1 DESCRIPTION
 
@@ -486,7 +486,7 @@ sub bits {
            $mask |= $DeadBits{$word} if $fatal ;
        }
        else
-          { croak("unknown warnings category '$word'")}
+          { croak("Unknown warnings category '$word'")}
     }
 
     return $mask ;
@@ -523,12 +523,12 @@ sub __chk
         $category = shift ;
         if (ref $category) {
             croak ("not an object")
-                if $category !~ /^([^=]+)=/ ;+
+                if $category !~ /^([^=]+)=/ ;
            $category = $1 ;
             $isobj = 1 ;
         }
         $offset = $Offsets{$category};
-        croak("unknown warnings category '$category'")
+        croak("Unknown warnings category '$category'")
            unless defined $offset;
     }
     else {