Merge pull request #536 from RyanGlScott/master

Remove INLINE pragma on timeOfDay64
haskell · Apr 2, 2017 · 83f2830 · 83f2830
2 parents 2abacb9 + 13eea8c
commit 83f2830
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/Data/Aeson/Encoding/Builder.hs b/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 _ _)

diff --git a/benchmarks/aeson-benchmarks.cabal b/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,