summaryrefslogtreecommitdiff
path: root/libraries/base/Control
diff options
context:
space:
mode:
authorIan Lynagh <igloo@earth.li>2013-01-12 19:34:39 +0000
committerIan Lynagh <igloo@earth.li>2013-01-12 19:34:39 +0000
commit753e3e3811db4b866ba67122843258d002a25e9e (patch)
tree6e58c14ea2dbe291873962ecd01087aa31c453e7 /libraries/base/Control
parentf54bc5f9bc83b9cda557ef6038aa097caeb1d0fc (diff)
downloadhaskell-753e3e3811db4b866ba67122843258d002a25e9e.tar.gz
Fix ambiguity error on Windows
I assume that we only want to catch IOExceptions, as withThread does.
Diffstat (limited to 'libraries/base/Control')
-rw-r--r--libraries/base/Control/Concurrent.hs4
1 files changed, 2 insertions, 2 deletions
diff --git a/libraries/base/Control/Concurrent.hs b/libraries/base/Control/Concurrent.hs
index 3733a07494..ae015a88b6 100644
--- a/libraries/base/Control/Concurrent.hs
+++ b/libraries/base/Control/Concurrent.hs
@@ -466,7 +466,7 @@ threadWaitReadSTM fd
case result of
Nothing -> retry
Just (Right ()) -> return ()
- Just (Left e) -> throwSTM e
+ Just (Left e) -> throwSTM (e :: IOException)
let killAction = return ()
return (waitAction, killAction)
| otherwise = error "threadWaitReadSTM requires -threaded on Windows"
@@ -488,7 +488,7 @@ threadWaitWriteSTM fd
case result of
Nothing -> retry
Just (Right ()) -> return ()
- Just (Left e) -> throwSTM e
+ Just (Left e) -> throwSTM (e :: IOException)
let killAction = return ()
return (waitAction, killAction)
| otherwise = error "threadWaitWriteSTM requires -threaded on Windows"