[commit: base] master: Fix ambiguity error on Windows (f0052dc)

Ian Lynagh igloo at earth.li
Sat Jan 12 21:50:00 CET 2013


Repository : ssh://darcs.haskell.org//srv/darcs/packages/base

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/f0052dc7cc8e911cc47ba91975ba5c2f232c4a6f

>---------------------------------------------------------------

commit f0052dc7cc8e911cc47ba91975ba5c2f232c4a6f
Author: Ian Lynagh <igloo at earth.li>
Date:   Sat Jan 12 19:34:39 2013 +0000

    Fix ambiguity error on Windows
    
    I assume that we only want to catch IOExceptions, as withThread does.

>---------------------------------------------------------------

 Control/Concurrent.hs |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Control/Concurrent.hs b/Control/Concurrent.hs
index 3733a07..ae015a8 100644
--- a/Control/Concurrent.hs
+++ b/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"





More information about the ghc-commits mailing list