merge from git-annex

1 files changed, 7 insertions, 3 deletions

diff --git a/Utility/QuickCheck.hs b/Utility/QuickCheck.hs
index cd408dd..0181ea9 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
@@ -16,16 +16,20 @@ module Utility.QuickCheck
 import Test.QuickCheck as X
 import Data.Time.Clock.POSIX
 import System.Posix.Types
+#if ! MIN_VERSION_QuickCheck(2,8,2)
 import qualified Data.Map as M
 import qualified Data.Set as S
+#endif
 import Control.Applicative
 import Prelude
 
-instance (Arbitrary k, Arbitrary v, Eq k, Ord k) => Arbitrary (M.Map k v) where
+#if ! MIN_VERSION_QuickCheck(2,8,2)
+instance (Arbitrary k, Arbitrary v, Ord k) => Arbitrary (M.Map k v) where
 	arbitrary = M.fromList <$> arbitrary
 
-instance (Arbitrary v, Eq v, Ord v) => Arbitrary (S.Set v) where
+instance (Arbitrary v, Ord v) => Arbitrary (S.Set v) where
 	arbitrary = S.fromList <$> arbitrary
+#endif
 
 {- Times before the epoch are excluded. -}
 instance Arbitrary POSIXTime where