Skip to content

Fix build for GHC 8.2 and 8.4 #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sergv wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix build for GHC 8.2 and 8.4 #3

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions Generator.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,7 @@ genTypeDecl maxCapability typeDesc = unlines
storableInstance = unlines
["instance Storable " ++ dataName ++ " where"
," sizeOf x = vectorSize x * elementSize x"
," alignment = sizeOf" -- for best performance align vectors as good as their size
," alignment = Foreign.Storable.sizeOf" -- for best performance align vectors as good as their size
," peek (Ptr a) = readOffAddr (Addr a) 0"
," poke (Ptr a) = writeOffAddr (Addr a) 0"
]
Expand Down Expand Up @@ -1035,14 +1035,15 @@ fileHeader td = unlines $
,"import GHC.Exts"
,"import GHC.ST"
,""
,"import Foreign.Storable"
,"import Foreign.Storable (Storable)"
,"import qualified Foreign.Storable"
,""
,"import Control.Monad.Primitive"
,""
,"import Data.Primitive.Types"
,"import Data.Primitive.ByteArray"
,"import Data.Primitive.Addr"
,"import Data.Monoid"
,if versionBranch compilerVersion < [8, 4] then "import Data.Monoid" else ""
,"import Data.Typeable"
,""
,"import qualified Data.Vector.Primitive as PV"
Expand Down