From: Ross Paterson Date: Wed, 13 Aug 2008 07:13:07 +0000 (+0000) Subject: use New.catch instead of catchException in OldException X-Git-Tag: 6_10_branch_has_been_forked~50 X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=08ce3c4c0b2c92553dfae30509069cdc29691a19;p=ghc-base.git use New.catch instead of catchException in OldException --- diff --git a/Control/OldException.hs b/Control/OldException.hs index 00b1cf4..afa4492 100644 --- a/Control/OldException.hs +++ b/Control/OldException.hs @@ -135,7 +135,6 @@ import GHC.Base import GHC.Num import GHC.Show import GHC.IOBase ( IO ) -import GHC.IOBase (catchException) import qualified GHC.IOBase as ExceptionBase import qualified GHC.IOBase as New import GHC.Conc hiding (setUncaughtExceptionHandler, @@ -398,7 +397,7 @@ catchDyn :: Typeable exception => IO a -> (exception -> IO a) -> IO a #ifdef __NHC__ catchDyn m k = m -- can't catch dyn exceptions in nhc98 #else -catchDyn m k = catchException m handle +catchDyn m k = New.catch m handle where handle ex = case ex of (DynException dyn) -> case fromDynamic dyn of