diff options
| author | hallgren <hallgren@chalmers.se> | 2012-11-08 15:53:46 +0000 |
|---|---|---|
| committer | hallgren <hallgren@chalmers.se> | 2012-11-08 15:53:46 +0000 |
| commit | 63093c32f33ad1fcfef10d2ef6ef010c2b5471e9 (patch) | |
| tree | d41a1ea8c6c5e58353f3a81440291be6d57d6e3b /src/compiler/GF/Infra | |
| parent | 1c0429c322d71c5488604785cf7278fe4ac67bf7 (diff) | |
Eliminate warnings about deprecated use of catch and try
This is also needed for compatibility with GHC 7.6.
Diffstat (limited to 'src/compiler/GF/Infra')
| -rw-r--r-- | src/compiler/GF/Infra/SIO.hs | 2 | ||||
| -rw-r--r-- | src/compiler/GF/Infra/UseIO.hs | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/compiler/GF/Infra/SIO.hs b/src/compiler/GF/Infra/SIO.hs index c8355b293..1011b8df4 100644 --- a/src/compiler/GF/Infra/SIO.hs +++ b/src/compiler/GF/Infra/SIO.hs @@ -21,7 +21,7 @@ module GF.Infra.SIO( import Prelude hiding (putStrLn,print) import Control.Monad(liftM) import System.IO(Handle,hPutStrLn,hFlush,stdout) -import System.IO.Error(try) +import GF.System.Catch(try) import System.Cmd(system) import System.Environment(getEnv) import Control.Concurrent.Chan(newChan,writeChan,getChanContents) diff --git a/src/compiler/GF/Infra/UseIO.hs b/src/compiler/GF/Infra/UseIO.hs index b559f0e92..dec2269fd 100644 --- a/src/compiler/GF/Infra/UseIO.hs +++ b/src/compiler/GF/Infra/UseIO.hs @@ -15,14 +15,17 @@ module GF.Infra.UseIO where +import Prelude hiding (catch) + import GF.Data.Operations import GF.Infra.Option +import GF.System.Catch import Paths_gf(getDataDir) import System.Directory import System.FilePath import System.IO -import System.IO.Error +import System.IO.Error(isUserError,ioeGetErrorString) import System.Environment import System.Exit import System.CPUTime |
