Fix import conflicts from modern stm

perl6 · Feb 29, 2012 · 3ec95ac · 3ec95ac
1 parent b5e9ef8
commit 3ec95ac
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/Pugs/src/Pugs/AST/SIO.hs b/Pugs/src/Pugs/AST/SIO.hs
@@ -10,7 +10,9 @@ module Pugs.AST.SIO (
     module Control.Concurrent.STM
 ) where
 import Pugs.Internals
-import Control.Concurrent.STM
+import Control.Concurrent.STM (STM, atomically, TVar,
+    writeTVar, readTVar, newTVarIO, newTVar, readTMVar, newTMVarIO,
+    tryPutTMVar, takeTMVar, newEmptyTMVar)
 
 instance Monad m => ((:>:) (m a)) (Identity a) where cast = return . runIdentity
 instance ((:>:) (SIO a)) (STM a) where cast = liftSTM

diff --git a/pugs-compat/src/Pugs/Compat.hs b/pugs-compat/src/Pugs/Compat.hs
@@ -23,7 +23,7 @@ import Pugs.Compat.Posix      as X
 import Pugs.Compat.Regex      as X 
 
 import Control.Concurrent     as X 
-import Control.Concurrent.STM as X (STM, atomically, always, alwaysSucceeds, retry, orElse, check, catchSTM)
+import Control.Concurrent.STM as X (TMVar, STM, atomically, always, alwaysSucceeds, retry, orElse, check, catchSTM)
 import Control.Exception      as X (catchJust, Exception(..))
 import Control.Monad          as X (replicateM, forM, forM_, MonadPlus(..), msum, liftM2, liftM3, guard, foldM, unless, liftM, filterM, join, when)
 import Control.Monad.Error    as X (MonadError(..), ErrorT(..), Error(..))