summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joeyh@joeyh.name>2016-01-24 14:15:00 -0400
committerSean Whitton <spwhitton@spwhitton.name>2017-07-25 17:19:31 -0700
commit1ecd24cc076b15e085529d41e5a873e334f75167 (patch)
treea70bdba058579158b2f25f3ade68bff1350ea400
parentd348ed3d2822a8cd4b777f74641baf040e7839e4 (diff)
downloadgit-repair-1ecd24cc076b15e085529d41e5a873e334f75167.tar.gz
Fix build with QuickCheck 2.8.2
It added some instances I had also implemented.
-rw-r--r--Utility/QuickCheck.hs4
1 files changed, 3 insertions, 1 deletions
diff --git a/Utility/QuickCheck.hs b/Utility/QuickCheck.hs
index cd408dd..8db03f4 100644
--- a/Utility/QuickCheck.hs
+++ b/Utility/QuickCheck.hs
@@ -6,7 +6,7 @@
-}
{-# OPTIONS_GHC -fno-warn-orphans #-}
-{-# LANGUAGE TypeSynonymInstances #-}
+{-# LANGUAGE TypeSynonymInstances, CPP #-}
module Utility.QuickCheck
( module X
@@ -21,11 +21,13 @@ import qualified Data.Set as S
import Control.Applicative
import Prelude
+#if ! MIN_VERSION_QuickCheck(2,8,2)
instance (Arbitrary k, Arbitrary v, Eq k, Ord k) => Arbitrary (M.Map k v) where
arbitrary = M.fromList <$> arbitrary
instance (Arbitrary v, Eq v, Ord v) => Arbitrary (S.Set v) where
arbitrary = S.fromList <$> arbitrary
+#endif
{- Times before the epoch are excluded. -}
instance Arbitrary POSIXTime where