[commit: base] master: Remove blocked (deprecated since 7.2) (10d0a92)

[Ian Lynagh]

Repository : ssh://darcs.haskell.org//srv/darcs/packages/base

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/10d0a92f3513efe0e7032d434fbaf6baa2b3540a

>---------------------------------------------------------------

commit 10d0a92f3513efe0e7032d434fbaf6baa2b3540a
Author: Ian Lynagh <ian at well-typed.com>
Date:   Tue Feb 19 19:21:25 2013 +0000

    Remove blocked (deprecated since 7.2)

>---------------------------------------------------------------

 Control/Exception.hs      |    4 ----
 Control/Exception/Base.hs |   11 -----------
 GHC/IO.hs                 |    8 +-------
 3 files changed, 1 insertions(+), 22 deletions(-)

diff --git a/Control/Exception.hs b/Control/Exception.hs
index 7a5f8d3..d104fe5 100644
--- a/Control/Exception.hs
+++ b/Control/Exception.hs
@@ -115,10 +115,6 @@ module Control.Exception (
         getMaskingState,
         allowInterrupt,
 
-        -- ** (deprecated) Asynchronous exception control
-
-        blocked,
-
         -- *** Applying @mask@ to an exception handler
 
         -- $block_handler
diff --git a/Control/Exception/Base.hs b/Control/Exception/Base.hs
index 266b74b..6ee7348 100644
--- a/Control/Exception/Base.hs
+++ b/Control/Exception/Base.hs
@@ -90,10 +90,6 @@ module Control.Exception.Base (
         MaskingState(..),
         getMaskingState,
 
-        -- ** (deprecated) Asynchronous exception control
-
-        blocked,
-
         -- * Assertions
 
         assert,
@@ -236,13 +232,6 @@ throwIO :: Exception e => e -> IO a
 throwIO e = Hugs.Exception.throwIO (toException e)
 #endif
 
-#ifndef __GLASGOW_HASKELL__
--- Dummy definitions for implementations lacking asynchonous exceptions
-
-blocked :: IO Bool
-blocked  = return False
-#endif
-
 -----------------------------------------------------------------------------
 -- Catching exceptions
 
diff --git a/GHC/IO.hs b/GHC/IO.hs
index a073d7b..80c8ffc 100644
--- a/GHC/IO.hs
+++ b/GHC/IO.hs
@@ -37,7 +37,7 @@ module GHC.IO (
         catchException, catchAny, throwIO,
         mask, mask_, uninterruptibleMask, uninterruptibleMask_, 
         MaskingState(..), getMaskingState,
-        blocked, unsafeUnmask,
+        unsafeUnmask,
         onException, bracket, finally, evaluate
     ) where
 
@@ -352,12 +352,6 @@ getMaskingState  = IO $ \s ->
                              1# -> MaskedUninterruptible
                              _  -> MaskedInterruptible #)
 
-{-# DEPRECATED blocked "use Control.Exception.getMaskingState instead" #-} -- deprecated in 7.2
--- | returns True if asynchronous exceptions are blocked in the
--- current thread.
-blocked :: IO Bool
-blocked = fmap (/= Unmasked) getMaskingState
-
 onException :: IO a -> IO b -> IO a
 onException io what = io `catchException` \e -> do _ <- what
                                                    throwIO (e :: SomeException)