Merge pull request #7 from bgamari/master

GHC 7.7 compatibility
gregorycollins · Oct 11, 2013 · ef7e2c3 · ef7e2c3
2 parents ae72cc2 + 458b8b6
commit ef7e2c3
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/src/Data/HashTable/Internal/CacheLine.hs b/src/Data/HashTable/Internal/CacheLine.hs
@@ -42,6 +42,12 @@ import           GHC.Int
 import           Data.HashTable.Internal.Utils
 import           GHC.Exts
 
+#if __GLASGOW_HASKELL__ >= 707
+import GHC.Exts (isTrue#)
+#else
+isTrue# = id
+#endif
+
 
 {-# INLINE prefetchRead  #-}
 {-# INLINE prefetchWrite #-}
@@ -144,7 +150,7 @@ advanceByCacheLineSize !(I# start0#) !(I# vecSize#) = out
 
 {-# INLINE isCacheLineAligned #-}
 isCacheLineAligned :: Int -> Bool
-isCacheLineAligned (I# x#) = r# ==# 0#
+isCacheLineAligned (I# x#) = isTrue# (r# ==# 0#)
   where
     !(I# m#) = cacheLineIntMask
     !mw#     = int2Word# m#