projects
/
ghc-base.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
9c38b9d
)
Fix incorrect #ifdef for nhc98
author
Malcolm.Wallace@me.com
<unknown>
Fri, 11 Feb 2011 11:17:28 +0000
(11:17 +0000)
committer
Malcolm.Wallace@me.com
<unknown>
Fri, 11 Feb 2011 11:17:28 +0000
(11:17 +0000)
System/IO/Error.hs
patch
|
blob
|
history
diff --git
a/System/IO/Error.hs
b/System/IO/Error.hs
index
65c2ea9
..
a026f33
100644
(file)
--- a/
System/IO/Error.hs
+++ b/
System/IO/Error.hs
@@
-130,7
+130,6
@@
import Data.Maybe (fromJust)
import Control.Monad (MonadPlus(mplus))
#endif
import Control.Monad (MonadPlus(mplus))
#endif
-#ifndef __NHC__
-- | The construct 'tryIOError' @comp@ exposes IO errors which occur within a
-- computation, and which are not fully handled.
--
-- | The construct 'tryIOError' @comp@ exposes IO errors which occur within a
-- computation, and which are not fully handled.
--
@@
-141,6
+140,7
@@
tryIOError f = catch (do r <- f
return (Right r))
(return . Left)
return (Right r))
(return . Left)
+#ifndef __NHC__
{-# DEPRECATED try "Please use the new exceptions variant, Control.Exception.try" #-}
-- | The 'try' function is deprecated. Please use the new exceptions
-- variant, 'Control.Exception.try' from "Control.Exception", instead.
{-# DEPRECATED try "Please use the new exceptions variant, Control.Exception.try" #-}
-- | The 'try' function is deprecated. Please use the new exceptions
-- variant, 'Control.Exception.try' from "Control.Exception", instead.