Better way of dealing with NFData

Closes #20
haskell · Sep 8, 2015 · 3b23dcb · 3b23dcb
1 parent 37edea2
commit 3b23dcb
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 8 deletions.
diff --git a/Data/Graph/Inductive/Internal/Heap.hs b/Data/Graph/Inductive/Internal/Heap.hs
@@ -14,7 +14,7 @@ module Data.Graph.Inductive.Internal.Heap(
 
 import Text.Show (showListWith)
 
-#if __GLASGOW_HASKELL__ >= 704
+#if MIN_VERSION_containers (0,4,2)
 import Control.DeepSeq (NFData (..))
 #endif
 

diff --git a/Data/Graph/Inductive/NodeMap.hs b/Data/Graph/Inductive/NodeMap.hs
@@ -34,7 +34,7 @@ import qualified Prelude                    as P (map)
 import           Data.Map (Map)
 import qualified Data.Map as M
 
-#if __GLASGOW_HASKELL__ >= 704
+#if MIN_VERSION_containers (0,4,2)
 import Control.DeepSeq (NFData (..))
 #endif
 

diff --git a/Data/Graph/Inductive/PatriciaTree.hs b/Data/Graph/Inductive/PatriciaTree.hs
@@ -34,7 +34,7 @@ import qualified Data.IntMap         as IM
 import           Data.List           (sort)
 import           Data.Maybe          (fromMaybe)
 
-#if __GLASGOW_HASKELL__ >= 704
+#if MIN_VERSION_containers (0,4,2)
 import Control.DeepSeq (NFData (..))
 #endif
 

diff --git a/Data/Graph/Inductive/Tree.hs b/Data/Graph/Inductive/Tree.hs
@@ -20,7 +20,7 @@ import           Data.Map            (Map)
 import qualified Data.Map            as M
 import           Data.Maybe          (fromMaybe)
 
-#if __GLASGOW_HASKELL__ >= 704
+#if MIN_VERSION_containers (0,4,2)
 import Control.DeepSeq (NFData (..))
 #endif
 

diff --git a/fgl.cabal b/fgl.cabal
@@ -21,6 +21,11 @@ source-repository head
     type:         git
     location:     git://github.com/haskell/fgl.git
 
+flag containers042 {
+    manual:  False
+    default: True
+}
+
 library {
     default-language: Haskell98
 
@@ -58,12 +63,13 @@ library {
 
     build-depends:    base < 5
                     , transformers
-                    , containers
                     , array
 
-    if impl(ghc >= 7.4)
-       build-depends:
-            deepseq >= 1.1.0.0 && < 1.5.0.0
+    if flag(containers042)
+        build-depends:    containers >= 0.4.2
+                        , deepseq >= 1.1.0.0 && < 1.5
+    else
+        build-depends:    containers < 0.4.2
 
     if impl(ghc >= 7.2) && impl(ghc < 7.6)
         build-depends: