Browse files

Fix import conflicts from modern stm

  • Loading branch information...
1 parent b5e9ef8 commit 3ec95ac9d395719d0e4ed9cc6ac19a0d5e068abe @lumimies lumimies committed Feb 29, 2012
Showing with 4 additions and 2 deletions.
  1. +3 −1 Pugs/src/Pugs/AST/SIO.hs
  2. +1 −1 pugs-compat/src/Pugs/Compat.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
@@ -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(..))

0 comments on commit 3ec95ac

Please sign in to comment.