Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : supercompiler
http://hackage.haskell.org/trac/ghc/changeset/8b70add11131ab48ec7df3345f7dd046e68ac7b4 >--------------------------------------------------------------- commit 8b70add11131ab48ec7df3345f7dd046e68ac7b4 Author: Max Bolingbroke <batterseapo...@hotmail.com> Date: Tue Feb 21 18:21:24 2012 +0000 Explicit import lists from Data.Monoid to prevent <> clash >--------------------------------------------------------------- .../supercompile/Supercompile/Drive/Process.hs | 2 +- .../supercompile/Supercompile/Drive/Process1.hs | 2 +- .../supercompile/Supercompile/Evaluator/Deeds.hs | 2 +- compiler/supercompile/Supercompile/Utilities.hs | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/compiler/supercompile/Supercompile/Drive/Process.hs b/compiler/supercompile/Supercompile/Drive/Process.hs index 25a18c8..09bc273 100644 --- a/compiler/supercompile/Supercompile/Drive/Process.hs +++ b/compiler/supercompile/Supercompile/Drive/Process.hs @@ -66,7 +66,7 @@ import qualified Control.Monad as Monad import Data.Ord import qualified Data.Map as M import qualified Data.IntMap as IM -import Data.Monoid +import Data.Monoid (Monoid(mappend, mempty)) import qualified Data.Set as S diff --git a/compiler/supercompile/Supercompile/Drive/Process1.hs b/compiler/supercompile/Supercompile/Drive/Process1.hs index 73c5073..52fff1b 100644 --- a/compiler/supercompile/Supercompile/Drive/Process1.hs +++ b/compiler/supercompile/Supercompile/Drive/Process1.hs @@ -41,7 +41,7 @@ import Control.Exception (handleJust, AsyncException(UserInterrupt)) import qualified Data.Foldable as Foldable import qualified Data.Traversable as Traversable import qualified Data.Map as M -import Data.Monoid +import Data.Monoid (Monoid(mappend, mempty)) import Data.Ord import qualified Data.Set as S diff --git a/compiler/supercompile/Supercompile/Evaluator/Deeds.hs b/compiler/supercompile/Supercompile/Evaluator/Deeds.hs index 87768d8..11c71a4 100644 --- a/compiler/supercompile/Supercompile/Evaluator/Deeds.hs +++ b/compiler/supercompile/Supercompile/Evaluator/Deeds.hs @@ -3,7 +3,7 @@ module Supercompile.Evaluator.Deeds where import Supercompile.StaticFlags import Supercompile.Utilities -import Data.Monoid +import Data.Monoid (Monoid(mappend, mempty)) -- | Number of unclaimed deeds. Invariant: always greater than or equal to 0 diff --git a/compiler/supercompile/Supercompile/Utilities.hs b/compiler/supercompile/Supercompile/Utilities.hs index 6117dd6..c241684 100644 --- a/compiler/supercompile/Supercompile/Utilities.hs +++ b/compiler/supercompile/Supercompile/Utilities.hs @@ -43,7 +43,7 @@ import qualified Data.Set as S import qualified Data.Map as M import qualified Data.Graph as G import qualified Data.Foldable as Foldable -import Data.Monoid +import Data.Monoid (Monoid(mappend, mempty)) import System.Directory import System.Exit _______________________________________________ Cvs-ghc mailing list Cvs-ghc@haskell.org http://www.haskell.org/mailman/listinfo/cvs-ghc
