git.iko.soy/typeable/aeson
on master help sign in
Fix base versions in CPP
401111cAdam Bergmark
Data/Aeson/Types/FromJSON.hs+3−3
compare with master
unifiedsplit
@@ -144,7 +144,7 @@ import qualified Data.Primitive.Array as PM
144import qualified Data.Primitive.SmallArray as PM
144import qualified Data.Primitive.SmallArray as PM
145import qualified Data.Primitive.Types as PM
145import qualified Data.Primitive.Types as PM
146
146
147−#if (MIN_VERSION_primitive(0,6,4))
147+#if MIN_VERSION_primitive(0,6,4)
148import qualified Data.Primitive.UnliftedArray as PM
148import qualified Data.Primitive.UnliftedArray as PM
149import qualified Data.Primitive.PrimArray as PM
149import qualified Data.Primitive.PrimArray as PM
150#endif
150#endif
@@ -1687,7 +1687,7 @@ instance FromJSON DotNetTime where
1687-- primitive
1687-- primitive
1688-------------------------------------------------------------------------------
1688-------------------------------------------------------------------------------
1689
1689
1690−#if (MIN_VERSION_base(0,4,7))
1690+#if MIN_VERSION_base(4,7,0)
1691instance FromJSON a => FromJSON (PM.Array a) where
1691instance FromJSON a => FromJSON (PM.Array a) where
1692 -- note: we could do better than this if vector exposed the data
1692 -- note: we could do better than this if vector exposed the data
1693 -- constructor in Data.Vector.
1693 -- constructor in Data.Vector.
@@ -1696,7 +1696,7 @@ instance FromJSON a => FromJSON (PM.Array a) where
1696instance FromJSON a => FromJSON (PM.SmallArray a) where
1696instance FromJSON a => FromJSON (PM.SmallArray a) where
1697 parseJSON = fmap Exts.fromList . parseJSON
1697 parseJSON = fmap Exts.fromList . parseJSON
1698
1698
1699−#if (MIN_VERSION_primitive(0,6,4))
1699+#if MIN_VERSION_primitive(0,6,4)
1700instance (PM.Prim a,FromJSON a) => FromJSON (PM.PrimArray a) where
1700instance (PM.Prim a,FromJSON a) => FromJSON (PM.PrimArray a) where
1701 parseJSON = fmap Exts.fromList . parseJSON
1701 parseJSON = fmap Exts.fromList . parseJSON
1702
1702
Data/Aeson/Types/ToJSON.hs+10−10
@@ -132,7 +132,7 @@ import qualified Data.Primitive.Array as PM
132import qualified Data.Primitive.SmallArray as PM
132import qualified Data.Primitive.SmallArray as PM
133import qualified Data.Primitive.Types as PM
133import qualified Data.Primitive.Types as PM
134
134
135−#if (MIN_VERSION_primitive(0,6,4))
135+#if MIN_VERSION_primitive(0,6,4)
136import qualified Data.Primitive.UnliftedArray as PM
136import qualified Data.Primitive.UnliftedArray as PM
137import qualified Data.Primitive.PrimArray as PM
137import qualified Data.Primitive.PrimArray as PM
138#endif
138#endif
@@ -1918,25 +1918,25 @@ formatMillis = take 3 . formatTime defaultTimeLocale "%q"
1918-- primitive
1918-- primitive
1919-------------------------------------------------------------------------------
1919-------------------------------------------------------------------------------
1920
1920
1921−#if (MIN_VERSION_base(0,4,7))
1921+#if MIN_VERSION_base(4,7,0)
1922instance ToJSON a => ToJSON (PM.Array a) where
1922instance ToJSON a => ToJSON (PM.Array a) where
1923 -- note: we could do better than this if vector exposed the data
1923 -- note: we could do better than this if vector exposed the data
1924 -- constructor in Data.Vector.
1924 -- constructor in Data.Vector.
1925− toJSON = toJSON . Exts.toList
1925+ toJSON = toJSON . Exts.toList
1926− toEncoding = toEncoding . Exts.toList
1926+ toEncoding = toEncoding . Exts.toList
1927
1927
1928instance ToJSON a => ToJSON (PM.SmallArray a) where
1928instance ToJSON a => ToJSON (PM.SmallArray a) where
1929− toJSON = toJSON . Exts.toList
1929+ toJSON = toJSON . Exts.toList
1930− toEncoding = toEncoding . Exts.toList
1930+ toEncoding = toEncoding . Exts.toList
1931
1931
1932#if (MIN_VERSION_primitive(0,6,4))
1932#if (MIN_VERSION_primitive(0,6,4))
1933instance (PM.Prim a,ToJSON a) => ToJSON (PM.PrimArray a) where
1933instance (PM.Prim a,ToJSON a) => ToJSON (PM.PrimArray a) where
1934− toJSON = toJSON . Exts.toList
1934+ toJSON = toJSON . Exts.toList
1935− toEncoding = toEncoding . Exts.toList
1935+ toEncoding = toEncoding . Exts.toList
1936
1936
1937instance (PM.PrimUnlifted a,ToJSON a) => ToJSON (PM.UnliftedArray a) where
1937instance (PM.PrimUnlifted a,ToJSON a) => ToJSON (PM.UnliftedArray a) where
1938− toJSON = toJSON . Exts.toList
1938+ toJSON = toJSON . Exts.toList
1939− toEncoding = toEncoding . Exts.toList
1939+ toEncoding = toEncoding . Exts.toList
1940#endif
1940#endif
1941#endif
1941#endif
1942
1942