diff options
| author | simonmar <unknown> | 2001-12-21 15:07:26 +0000 |
|---|---|---|
| committer | simonmar <unknown> | 2001-12-21 15:07:26 +0000 |
| commit | ceb68b9118fa883e88abfaa532fc78f6640cf17f (patch) | |
| tree | b90b04a394fee4abd0cb09205120bee964684d7b /libraries/base/Control/Exception.hs | |
| parent | b83cfb91b4d36d148ebe171d31e2676c8f10f371 (diff) | |
| download | haskell-ceb68b9118fa883e88abfaa532fc78f6640cf17f.tar.gz | |
[project @ 2001-12-21 15:07:20 by simonmar]
Merge up to the ghc/lib/std on the HEAD (tagged as
new-libraries-last-merged).
Diffstat (limited to 'libraries/base/Control/Exception.hs')
| -rw-r--r-- | libraries/base/Control/Exception.hs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libraries/base/Control/Exception.hs b/libraries/base/Control/Exception.hs index abd0861e48..529d364d13 100644 --- a/libraries/base/Control/Exception.hs +++ b/libraries/base/Control/Exception.hs @@ -8,7 +8,7 @@ -- Stability : experimental -- Portability : non-portable -- --- $Id: Exception.hs,v 1.4 2001/10/18 11:14:17 rrt Exp $ +-- $Id: Exception.hs,v 1.5 2001/12/21 15:07:21 simonmar Exp $ -- -- The External API for exceptions. The functions provided in this -- module allow catching of exceptions in the IO monad. @@ -76,7 +76,7 @@ module Control.Exception ( #ifdef __GLASGOW_HASKELL__ import Prelude hiding (catch) -import GHC.Prim ( assert ) +import GHC.Base ( assert ) import GHC.Exception hiding (try, catch, bracket, bracket_) import GHC.Conc ( throwTo, ThreadId ) import GHC.IOBase ( IO(..) ) |