git.iko.soy/typeable/aeson
on master help sign in
Fix base versions in CPP
commit401111cbea8cd077f3c3965265a1c4a2b3371ece authorAdam Bergmark <adam@bergmark.nl> dateMon 24 Sep 2018, 01:38 (8 years ago) parent2d77af0
2 files changed+13−13
compare with master
unifiedsplit
Data/Aeson/Types/FromJSON.hs+3−3 Data/Aeson/Types/ToJSON.hs+10−10
Data/Aeson/Types/FromJSON.hs+3−3
@@ -144,7 +144,7 @@ import qualified Data.Primitive.Array as PM
144144import qualified Data.Primitive.SmallArray as PM
145145import qualified Data.Primitive.Types as PM
146146
147−#if (MIN_VERSION_primitive(0,6,4))
147+#if MIN_VERSION_primitive(0,6,4)
148148import qualified Data.Primitive.UnliftedArray as PM
149149import qualified Data.Primitive.PrimArray as PM
150150#endif
@@ -1687,7 +1687,7 @@ instance FromJSON DotNetTime where
16871687-- primitive
16881688-------------------------------------------------------------------------------
16891689
1690−#if (MIN_VERSION_base(0,4,7))
1690+#if MIN_VERSION_base(4,7,0)
16911691instance FromJSON a => FromJSON (PM.Array a) where
16921692 -- note: we could do better than this if vector exposed the data
16931693 -- constructor in Data.Vector.
@@ -1696,7 +1696,7 @@ instance FromJSON a => FromJSON (PM.Array a) where
16961696instance FromJSON a => FromJSON (PM.SmallArray a) where
16971697 parseJSON = fmap Exts.fromList . parseJSON
16981698
1699−#if (MIN_VERSION_primitive(0,6,4))
1699+#if MIN_VERSION_primitive(0,6,4)
17001700instance (PM.Prim a,FromJSON a) => FromJSON (PM.PrimArray a) where
17011701 parseJSON = fmap Exts.fromList . parseJSON
17021702
Data/Aeson/Types/ToJSON.hs+10−10
@@ -132,7 +132,7 @@ import qualified Data.Primitive.Array as PM
132132import qualified Data.Primitive.SmallArray as PM
133133import qualified Data.Primitive.Types as PM
134134
135−#if (MIN_VERSION_primitive(0,6,4))
135+#if MIN_VERSION_primitive(0,6,4)
136136import qualified Data.Primitive.UnliftedArray as PM
137137import qualified Data.Primitive.PrimArray as PM
138138#endif
@@ -1918,25 +1918,25 @@ formatMillis = take 3 . formatTime defaultTimeLocale "%q"
19181918-- primitive
19191919-------------------------------------------------------------------------------
19201920
1921−#if (MIN_VERSION_base(0,4,7))
1921+#if MIN_VERSION_base(4,7,0)
19221922instance ToJSON a => ToJSON (PM.Array a) where
19231923 -- note: we could do better than this if vector exposed the data
19241924 -- constructor in Data.Vector.
1925− toJSON = toJSON . Exts.toList
1926− toEncoding = toEncoding . Exts.toList
1925+ toJSON = toJSON . Exts.toList
1926+ toEncoding = toEncoding . Exts.toList
19271927
19281928instance ToJSON a => ToJSON (PM.SmallArray a) where
1929− toJSON = toJSON . Exts.toList
1930− toEncoding = toEncoding . Exts.toList
1929+ toJSON = toJSON . Exts.toList
1930+ toEncoding = toEncoding . Exts.toList
19311931
19321932#if (MIN_VERSION_primitive(0,6,4))
19331933instance (PM.Prim a,ToJSON a) => ToJSON (PM.PrimArray a) where
1934− toJSON = toJSON . Exts.toList
1935− toEncoding = toEncoding . Exts.toList
1934+ toJSON = toJSON . Exts.toList
1935+ toEncoding = toEncoding . Exts.toList
19361936
19371937instance (PM.PrimUnlifted a,ToJSON a) => ToJSON (PM.UnliftedArray a) where
1938− toJSON = toJSON . Exts.toList
1939− toEncoding = toEncoding . Exts.toList
1938+ toJSON = toJSON . Exts.toList
1939+ toEncoding = toEncoding . Exts.toList
19401940#endif
19411941#endif
19421942