[commit: packages/parallel] master: Use more exact CPP guards for 0ec7fe287db9b837a (77e9e30)
git at git.haskell.org
git at git.haskell.org
Sat Jan 2 08:17:07 UTC 2016
Repository : ssh://git@git.haskell.org/parallel
On branch : master
Link : http://git.haskell.org/packages/parallel.git/commitdiff/77e9e303591cddd92506c0e856ddcaa439146320
>---------------------------------------------------------------
commit 77e9e303591cddd92506c0e856ddcaa439146320
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date: Sat Jan 2 08:55:02 2016 +0100
Use more exact CPP guards for 0ec7fe287db9b837a
>---------------------------------------------------------------
77e9e303591cddd92506c0e856ddcaa439146320
Control/Seq.hs | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/Control/Seq.hs b/Control/Seq.hs
index 13c5d0e..13211ff 100644
--- a/Control/Seq.hs
+++ b/Control/Seq.hs
@@ -66,7 +66,7 @@ import Data.Foldable (Foldable, toList)
#endif
import Data.Map (Map)
import qualified Data.Map (toList)
-#if __GLASGOW_HASKELL__ < 711
+#if !((__GLASGOW_HASKELL__ >= 711) && MIN_VERSION_array(0,5,1))
import Data.Ix (Ix)
#endif
import Data.Array (Array)
@@ -148,7 +148,7 @@ seqFoldable strat = seqList strat . toList
-- | Evaluate the elements of an array according to the given strategy.
-- Evaluation of the array bounds may be triggered as a side effect.
-#if __GLASGOW_HASKELL__ >= 711
+#if (__GLASGOW_HASKELL__ >= 711) && MIN_VERSION_array(0,5,1)
seqArray :: Strategy a -> Strategy (Array i a)
#else
seqArray :: Ix i => Strategy a -> Strategy (Array i a)
@@ -156,7 +156,7 @@ seqArray :: Ix i => Strategy a -> Strategy (Array i a)
seqArray strat = seqList strat . Data.Array.elems
-- | Evaluate the bounds of an array according to the given strategy.
-#if __GLASGOW_HASKELL__ >= 711
+#if (__GLASGOW_HASKELL__ >= 711) && MIN_VERSION_array(0,5,1)
seqArrayBounds :: Strategy i -> Strategy (Array i a)
#else
seqArrayBounds :: Ix i => Strategy i -> Strategy (Array i a)
More information about the ghc-commits
mailing list