Merge branch 'master' of github.com:zhensydow/opencl

IFCA-Advanced-Computing · Feb 20, 2013 · c5e4373 · c5e4373
2 parents 0009159 + 09a089c
commit c5e4373
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/OpenCL.cabal b/OpenCL.cabal
@@ -34,7 +34,7 @@ Library
   Build-tools: c2hs
   hs-Source-Dirs: src
   ghc-options: -Wall
-  Build-Depends: base >=4.0 && < 5, bytestring -any, mtl==2.0.*
+  Build-Depends: base >=4.0 && < 5, bytestring -any, mtl>=2
   Exposed-Modules: 
     Control.Parallel.OpenCL
     Control.Parallel.OpenCL.Query

diff --git a/src/Control/Parallel/OpenCL/Types.chs b/src/Control/Parallel/OpenCL/Types.chs
@@ -711,10 +711,10 @@ binaryFlags m = map toEnum . takeWhile (<= (fromEnum m)) $ [1 `shiftL` n | n <-
 testMask :: Bits b => b -> b -> Bool
 testMask mask v = (v .&. mask) == v
 
-bitmaskFromFlags :: (Enum a, Bits b) => [a] -> b
+bitmaskFromFlags :: (Enum a, Bits b, Num b) => [a] -> b
 bitmaskFromFlags = foldl' (.|.) 0 . map (fromIntegral . fromEnum)
 
-bitmaskToFlags :: (Enum a, Bits b) => [a] -> b -> [a]
+bitmaskToFlags :: (Enum a, Bits b, Num b) => [a] -> b -> [a]
 bitmaskToFlags xs mask = filter (testMask mask . fromIntegral . fromEnum) xs
 
 bitmaskToDeviceTypes :: CLDeviceType_ -> [CLDeviceType]