Merge pull request #536 from RyanGlScott/master

Remove INLINE pragma on timeOfDay64

Author: bergmark

Data/Aeson/Encoding/Builder.hs

@@ -234,7 +234,6 @@ timeOfDay64 (TOD h m s)
     pico       = 1000000000000 -- number of picoseconds  in 1 second
     micro      =       1000000 -- number of microseconds in 1 second
     milli      =          1000 -- number of milliseconds in 1 second
-{-# INLINE timeOfDay64 #-}
 
 timeZone :: TimeZone -> Builder
 timeZone (TimeZone off _ _)

benchmarks/aeson-benchmarks.cabal

@@ -179,7 +179,7 @@ executable aeson-benchmark-json-parse
 
 executable aeson-benchmark-dates
   main-is: Dates.hs
-  ghc-options: -Wall -O2 -rtsopts -fsimpl-tick-factor=200
+  ghc-options: -Wall -O2 -rtsopts
   build-depends:
     base,
     base-compat,