X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Futils%2FFastMutInt.lhs;h=1b2b05eb9f7e5a2d451d97be3bd6596afffb184f;hb=aa0c0de94e25aa64139688f8e4c4ba51ddca6f54;hp=e8ea58c8db80b456fc7a88daf803018566afb472;hpb=0d792bea36420e657fb293d9f90f35d8ef96cb4f;p=ghc-hetmet.git diff --git a/compiler/utils/FastMutInt.lhs b/compiler/utils/FastMutInt.lhs index e8ea58c..1b2b05e 100644 --- a/compiler/utils/FastMutInt.lhs +++ b/compiler/utils/FastMutInt.lhs @@ -25,9 +25,14 @@ module FastMutInt( #endif import GHC.Base -import GHC.IOBase import GHC.Ptr +#if __GLASGOW_HASKELL__ >= 611 +-- import GHC.IO ( IO(..) ) +#else +import GHC.IOBase ( IO(..) ) +#endif + #else /* ! __GLASGOW_HASKELL__ */ import Data.IORef @@ -50,7 +55,7 @@ data FastMutInt = FastMutInt (MutableByteArray# RealWorld) newFastMutInt = IO $ \s -> case newByteArray# size s of { (# s, arr #) -> (# s, FastMutInt arr #) } - where I# size = SIZEOF_HSINT + where !(I# size) = SIZEOF_HSINT readFastMutInt (FastMutInt arr) = IO $ \s -> case readIntArray# arr 0# s of { (# s, i #) -> @@ -65,7 +70,7 @@ data FastMutPtr = FastMutPtr (MutableByteArray# RealWorld) newFastMutPtr = IO $ \s -> case newByteArray# size s of { (# s, arr #) -> (# s, FastMutPtr arr #) } - where I# size = SIZEOF_VOID_P + where !(I# size) = SIZEOF_VOID_P readFastMutPtr (FastMutPtr arr) = IO $ \s -> case readAddrArray# arr 0# s of { (# s, i #) ->