diff options
| author | Simon Peyton Jones <simonpj@microsoft.com> | 2011-12-19 16:45:53 +0000 |
|---|---|---|
| committer | Simon Peyton Jones <simonpj@microsoft.com> | 2011-12-19 16:45:53 +0000 |
| commit | a1d588650d715a8c0edd4828e9c2e1dd1d760f48 (patch) | |
| tree | 4f10b59ba61c69811075e41c5f00bd995e2f36e4 /compiler/utils | |
| parent | c492e50bd681551e14f12d9fe7479d986b47e9dc (diff) | |
| parent | f542da48a7c7bdc8c7f116cfbf3db91d7d719196 (diff) | |
| download | haskell-a1d588650d715a8c0edd4828e9c2e1dd1d760f48.tar.gz | |
Merge branch 'master' of http://darcs.haskell.org//ghc
Diffstat (limited to 'compiler/utils')
| -rw-r--r-- | compiler/utils/Exception.hs | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/compiler/utils/Exception.hs b/compiler/utils/Exception.hs index fa067b0859..28196eba2b 100644 --- a/compiler/utils/Exception.hs +++ b/compiler/utils/Exception.hs @@ -74,19 +74,11 @@ class Monad m => ExceptionMonad m where _ <- sequel return r -#if __GLASGOW_HASKELL__ < 613 -instance ExceptionMonad IO where - gcatch = catch - gmask f = block $ f unblock - gblock = block - gunblock = unblock -#else instance ExceptionMonad IO where gcatch = catch gmask f = mask (\x -> f x) gblock = block gunblock = unblock -#endif gtry :: (ExceptionMonad m, Exception e) => m a -> m (Either e a) gtry act = gcatch (act >>= \a -> return (Right a)) |