Commits

Aleksey Khudyakov committed 75b7c70 Merge

Merge pull request #1 from JohnLato/master

histogram-fill: support ghc-7.8

Comments (0)

Files changed (1)

histogram-fill/Data/Histogram/Generic.hs

 --
 --   [@a@] type of bin content.
 data Histogram v bin a = Histogram !bin !(Maybe (a,a)) !(v a)
+#if MIN_VERSION_base(4,7,0)
+                         deriving (Eq, Typeable)
+#else
                          deriving (Eq)
+#endif
 
 -- | Create histogram from binning algorithm and vector with
 -- data. Overflows are set to Nothing. 
                                 "# Overflows  = \n"
 
 
+#if !MIN_VERSION_base(4,7,0)
+
 histTyCon :: String -> String -> TyCon
 #if MIN_VERSION_base(4,4,0)
 histTyCon = mkTyCon3 "histogram-fill"
 #else
 histTyCon m s = mkTyCon $ m ++ "." ++ s
 #endif
+-- end MIN_VERSION_base(4,4,0)
 
 instance Typeable1 v => Typeable2 (Histogram v) where
   typeOf2 h = mkTyConApp (histTyCon "Data.Histogram.Generic" "Histogram") [typeOf1 $ histData h]
-
+#endif
 
 
 -- | Vector do not supply 'NFData' instance so let just 'seq' it and