Import orphan Monoid instance from base-orphans

conal · Jun 7, 2015 · bc65820 · bc65820
1 parent f88c735
commit bc65820
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/TypeCompose.cabal b/TypeCompose.cabal
@@ -25,7 +25,7 @@ source-repository head
 
 Library
   Hs-Source-Dirs:      src
-  Build-Depends:       base<5
+  Build-Depends:       base<5, base-orphans
   Exposed-Modules:     
                        Data.Bijection
                        Data.CxMonoid

diff --git a/src/Control/Compose.hs b/src/Control/Compose.hs
@@ -6,8 +6,6 @@
 -- For ghc 6.6 compatibility
 -- {-# OPTIONS -fglasgow-exts -fallow-undecidable-instances #-}
 
-{-# OPTIONS_GHC -Wall -fno-warn-orphans #-}
-
 ----------------------------------------------------------------------
 -- |
 -- Module      :  Control.Compose
@@ -76,6 +74,7 @@ import Control.Arrow
                       hiding (pure)
 #endif
 
+import Data.Orphans ()
 import Data.Monoid
 import Data.Foldable
 import Data.Traversable
@@ -904,12 +903,7 @@ inConst3 f (Const a) = inConst2 (f a)
 
 ---- For Control.Applicative.Endo
 
-#if defined(__GLASGOW_HASKELL__) && __GLASGOW_HASKELL__ < 707
 -- deriving instance Monoid o => Monoid (Const o a)
-instance Monoid o => Monoid (Const o a) where
-  mempty  = Const mempty
-  mappend = inConst2 mappend
-#endif
 
 -- newtype Endo a = Endo { appEndo :: a -> a }