summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorBas van Dijk <v.dijk.bas@gmail.com>2011-12-24 21:39:19 +0100
committerBas van Dijk <v.dijk.bas@gmail.com>2011-12-24 21:39:19 +0100
commit43956aff360476d095b03fbbdef20f18df2dc933 (patch)
tree950e968a34d46011476bb7fe0adf25c2f6c37ae4 /lib
parent3831bed8a046e53483292a0771ee1ff5b3fecf7a (diff)
Warning police for GHC < 7.4
The previous patch got rid of warnings when ghc >= 7.4. Unfortunately this caused warnings on GHC < 7.4. This patch removes warnings on all versions of GHC.
Diffstat (limited to 'lib')
-rw-r--r--lib/Data/Packed/Internal/Common.hs2
-rw-r--r--lib/Data/Packed/Internal/Matrix.hs2
-rw-r--r--lib/Data/Packed/Internal/Vector.hs2
-rw-r--r--lib/Numeric/ContainerBoot.hs4
-rw-r--r--lib/Numeric/GSL/Differentiation.hs2
-rw-r--r--lib/Numeric/GSL/Fitting.hs2
-rw-r--r--lib/Numeric/GSL/Fourier.hs2
-rw-r--r--lib/Numeric/GSL/Integration.hs2
-rw-r--r--lib/Numeric/GSL/Internal.hs2
-rw-r--r--lib/Numeric/GSL/Minimization.hs2
-rw-r--r--lib/Numeric/GSL/ODE.hs2
-rw-r--r--lib/Numeric/GSL/Polynomials.hs7
-rw-r--r--lib/Numeric/GSL/Root.hs2
-rw-r--r--lib/Numeric/GSL/Vector.hs2
-rw-r--r--lib/Numeric/LinearAlgebra/LAPACK.hs2
15 files changed, 22 insertions, 15 deletions
diff --git a/lib/Data/Packed/Internal/Common.hs b/lib/Data/Packed/Internal/Common.hs
index 60e3444..a8c3c3e 100644
--- a/lib/Data/Packed/Internal/Common.hs
+++ b/lib/Data/Packed/Internal/Common.hs
@@ -27,7 +27,7 @@ module Data.Packed.Internal.Common(
27import Foreign 27import Foreign
28import Control.Monad(when) 28import Control.Monad(when)
29import Foreign.C.String(peekCString) 29import Foreign.C.String(peekCString)
30import Foreign.C.Types(CInt(..), CChar) 30import Foreign.C.Types
31import Foreign.Storable.Complex() 31import Foreign.Storable.Complex()
32import Data.List(transpose,intersperse) 32import Data.List(transpose,intersperse)
33import Control.Exception as E 33import Control.Exception as E
diff --git a/lib/Data/Packed/Internal/Matrix.hs b/lib/Data/Packed/Internal/Matrix.hs
index 9fbaf6d..5d05e50 100644
--- a/lib/Data/Packed/Internal/Matrix.hs
+++ b/lib/Data/Packed/Internal/Matrix.hs
@@ -44,7 +44,7 @@ import Foreign.Marshal.Array(newArray)
44import Foreign.Ptr(Ptr, castPtr) 44import Foreign.Ptr(Ptr, castPtr)
45import Foreign.Storable(Storable, peekElemOff, pokeElemOff, poke, sizeOf) 45import Foreign.Storable(Storable, peekElemOff, pokeElemOff, poke, sizeOf)
46import Data.Complex(Complex) 46import Data.Complex(Complex)
47import Foreign.C.Types(CInt(..), CChar) 47import Foreign.C.Types
48import Foreign.C.String(newCString) 48import Foreign.C.String(newCString)
49import System.IO.Unsafe(unsafePerformIO) 49import System.IO.Unsafe(unsafePerformIO)
50 50
diff --git a/lib/Data/Packed/Internal/Vector.hs b/lib/Data/Packed/Internal/Vector.hs
index 5062bc0..b9dba8e 100644
--- a/lib/Data/Packed/Internal/Vector.hs
+++ b/lib/Data/Packed/Internal/Vector.hs
@@ -38,7 +38,7 @@ import Foreign.ForeignPtr(ForeignPtr, castForeignPtr)
38import Foreign.Ptr(Ptr) 38import Foreign.Ptr(Ptr)
39import Foreign.Storable(Storable, peekElemOff, pokeElemOff, sizeOf) 39import Foreign.Storable(Storable, peekElemOff, pokeElemOff, sizeOf)
40import Foreign.C.String 40import Foreign.C.String
41import Foreign.C.Types(CInt(..), CChar) 41import Foreign.C.Types
42import Data.Complex 42import Data.Complex
43import Control.Monad(when) 43import Control.Monad(when)
44import System.IO.Unsafe(unsafePerformIO) 44import System.IO.Unsafe(unsafePerformIO)
diff --git a/lib/Numeric/ContainerBoot.hs b/lib/Numeric/ContainerBoot.hs
index fb783ce..0215711 100644
--- a/lib/Numeric/ContainerBoot.hs
+++ b/lib/Numeric/ContainerBoot.hs
@@ -1,3 +1,4 @@
1{-# LANGUAGE CPP #-}
1{-# LANGUAGE TypeFamilies #-} 2{-# LANGUAGE TypeFamilies #-}
2{-# LANGUAGE FlexibleContexts #-} 3{-# LANGUAGE FlexibleContexts #-}
3{-# LANGUAGE FlexibleInstances #-} 4{-# LANGUAGE FlexibleInstances #-}
@@ -49,7 +50,10 @@ import Data.Packed.ST as ST
49import Numeric.Conversion 50import Numeric.Conversion
50import Data.Packed.Internal 51import Data.Packed.Internal
51import Numeric.GSL.Vector 52import Numeric.GSL.Vector
53
54#if __GLASGOW_HASKELL__ >= 704
52import Foreign.C.Types(CInt(..)) 55import Foreign.C.Types(CInt(..))
56#endif
53 57
54import Data.Complex 58import Data.Complex
55import Control.Monad(ap) 59import Control.Monad(ap)
diff --git a/lib/Numeric/GSL/Differentiation.hs b/lib/Numeric/GSL/Differentiation.hs
index 1df58a1..ab5eb50 100644
--- a/lib/Numeric/GSL/Differentiation.hs
+++ b/lib/Numeric/GSL/Differentiation.hs
@@ -22,7 +22,7 @@ module Numeric.GSL.Differentiation (
22 derivBackward 22 derivBackward
23) where 23) where
24 24
25import Foreign.C.Types(CInt(..)) 25import Foreign.C.Types
26import Foreign.Marshal.Alloc(malloc, free) 26import Foreign.Marshal.Alloc(malloc, free)
27import Foreign.Ptr(Ptr, FunPtr, freeHaskellFunPtr) 27import Foreign.Ptr(Ptr, FunPtr, freeHaskellFunPtr)
28import Foreign.Storable(peek) 28import Foreign.Storable(peek)
diff --git a/lib/Numeric/GSL/Fitting.hs b/lib/Numeric/GSL/Fitting.hs
index da5c0fc..79db23f 100644
--- a/lib/Numeric/GSL/Fitting.hs
+++ b/lib/Numeric/GSL/Fitting.hs
@@ -54,7 +54,7 @@ import Numeric.LinearAlgebra
54import Numeric.GSL.Internal 54import Numeric.GSL.Internal
55 55
56import Foreign.Ptr(FunPtr, freeHaskellFunPtr) 56import Foreign.Ptr(FunPtr, freeHaskellFunPtr)
57import Foreign.C.Types(CInt(..)) 57import Foreign.C.Types
58import System.IO.Unsafe(unsafePerformIO) 58import System.IO.Unsafe(unsafePerformIO)
59 59
60------------------------------------------------------------------------- 60-------------------------------------------------------------------------
diff --git a/lib/Numeric/GSL/Fourier.hs b/lib/Numeric/GSL/Fourier.hs
index 5cc50dc..71bc8a1 100644
--- a/lib/Numeric/GSL/Fourier.hs
+++ b/lib/Numeric/GSL/Fourier.hs
@@ -22,7 +22,7 @@ module Numeric.GSL.Fourier (
22 22
23import Data.Packed.Internal 23import Data.Packed.Internal
24import Data.Complex 24import Data.Complex
25import Foreign.C.Types(CInt(..)) 25import Foreign.C.Types
26import System.IO.Unsafe (unsafePerformIO) 26import System.IO.Unsafe (unsafePerformIO)
27 27
28genfft code v = unsafePerformIO $ do 28genfft code v = unsafePerformIO $ do
diff --git a/lib/Numeric/GSL/Integration.hs b/lib/Numeric/GSL/Integration.hs
index a59862a..a0e922b 100644
--- a/lib/Numeric/GSL/Integration.hs
+++ b/lib/Numeric/GSL/Integration.hs
@@ -20,7 +20,7 @@ module Numeric.GSL.Integration (
20 integrateQAGS 20 integrateQAGS
21) where 21) where
22 22
23import Foreign.C.Types(CInt(..)) 23import Foreign.C.Types
24import Foreign.Marshal.Alloc(malloc, free) 24import Foreign.Marshal.Alloc(malloc, free)
25import Foreign.Ptr(Ptr, FunPtr, freeHaskellFunPtr) 25import Foreign.Ptr(Ptr, FunPtr, freeHaskellFunPtr)
26import Foreign.Storable(peek) 26import Foreign.Storable(peek)
diff --git a/lib/Numeric/GSL/Internal.hs b/lib/Numeric/GSL/Internal.hs
index a6c81ee..303e7e1 100644
--- a/lib/Numeric/GSL/Internal.hs
+++ b/lib/Numeric/GSL/Internal.hs
@@ -16,7 +16,7 @@ import Data.Packed.Internal
16 16
17import Foreign.Marshal.Array(copyArray) 17import Foreign.Marshal.Array(copyArray)
18import Foreign.Ptr(Ptr, FunPtr) 18import Foreign.Ptr(Ptr, FunPtr)
19import Foreign.C.Types(CInt(..)) 19import Foreign.C.Types
20import System.IO.Unsafe(unsafePerformIO) 20import System.IO.Unsafe(unsafePerformIO)
21 21
22iv :: (Vector Double -> Double) -> (CInt -> Ptr Double -> Double) 22iv :: (Vector Double -> Double) -> (CInt -> Ptr Double -> Double)
diff --git a/lib/Numeric/GSL/Minimization.hs b/lib/Numeric/GSL/Minimization.hs
index 6fac640..88acfac 100644
--- a/lib/Numeric/GSL/Minimization.hs
+++ b/lib/Numeric/GSL/Minimization.hs
@@ -65,7 +65,7 @@ import Data.Packed.Matrix
65import Numeric.GSL.Internal 65import Numeric.GSL.Internal
66 66
67import Foreign.Ptr(Ptr, FunPtr, freeHaskellFunPtr) 67import Foreign.Ptr(Ptr, FunPtr, freeHaskellFunPtr)
68import Foreign.C.Types(CInt(..)) 68import Foreign.C.Types
69import System.IO.Unsafe(unsafePerformIO) 69import System.IO.Unsafe(unsafePerformIO)
70 70
71------------------------------------------------------------------------ 71------------------------------------------------------------------------
diff --git a/lib/Numeric/GSL/ODE.hs b/lib/Numeric/GSL/ODE.hs
index 86c8bab..2251acd 100644
--- a/lib/Numeric/GSL/ODE.hs
+++ b/lib/Numeric/GSL/ODE.hs
@@ -36,7 +36,7 @@ import Data.Packed.Internal
36import Numeric.GSL.Internal 36import Numeric.GSL.Internal
37 37
38import Foreign.Ptr(FunPtr, nullFunPtr, freeHaskellFunPtr) 38import Foreign.Ptr(FunPtr, nullFunPtr, freeHaskellFunPtr)
39import Foreign.C.Types(CInt(..)) 39import Foreign.C.Types
40import System.IO.Unsafe(unsafePerformIO) 40import System.IO.Unsafe(unsafePerformIO)
41 41
42------------------------------------------------------------------------- 42-------------------------------------------------------------------------
diff --git a/lib/Numeric/GSL/Polynomials.hs b/lib/Numeric/GSL/Polynomials.hs
index 903c678..b21b1b6 100644
--- a/lib/Numeric/GSL/Polynomials.hs
+++ b/lib/Numeric/GSL/Polynomials.hs
@@ -1,4 +1,4 @@
1{-# LANGUAGE ForeignFunctionInterface #-} 1{-# LANGUAGE CPP, ForeignFunctionInterface #-}
2----------------------------------------------------------------------------- 2-----------------------------------------------------------------------------
3{- | 3{- |
4Module : Numeric.GSL.Polynomials 4Module : Numeric.GSL.Polynomials
@@ -21,9 +21,12 @@ module Numeric.GSL.Polynomials (
21 21
22import Data.Packed.Internal 22import Data.Packed.Internal
23import Data.Complex 23import Data.Complex
24import Foreign.C.Types(CInt(..))
25import System.IO.Unsafe (unsafePerformIO) 24import System.IO.Unsafe (unsafePerformIO)
26 25
26#if __GLASGOW_HASKELL__ >= 704
27import Foreign.C.Types (CInt(..))
28#endif
29
27{- | Solution of general polynomial equations, using /gsl_poly_complex_solve/. For example, 30{- | Solution of general polynomial equations, using /gsl_poly_complex_solve/. For example,
28 the three solutions of x^3 + 8 = 0 31 the three solutions of x^3 + 8 = 0
29 32
diff --git a/lib/Numeric/GSL/Root.hs b/lib/Numeric/GSL/Root.hs
index 5dfd4d7..9c2e5ab 100644
--- a/lib/Numeric/GSL/Root.hs
+++ b/lib/Numeric/GSL/Root.hs
@@ -54,7 +54,7 @@ import Data.Packed.Matrix
54import Numeric.GSL.Internal 54import Numeric.GSL.Internal
55 55
56import Foreign.Ptr(FunPtr, freeHaskellFunPtr) 56import Foreign.Ptr(FunPtr, freeHaskellFunPtr)
57import Foreign.C.Types(CInt(..)) 57import Foreign.C.Types
58import System.IO.Unsafe(unsafePerformIO) 58import System.IO.Unsafe(unsafePerformIO)
59 59
60------------------------------------------------------------------------- 60-------------------------------------------------------------------------
diff --git a/lib/Numeric/GSL/Vector.hs b/lib/Numeric/GSL/Vector.hs
index d0f419b..b8c6d04 100644
--- a/lib/Numeric/GSL/Vector.hs
+++ b/lib/Numeric/GSL/Vector.hs
@@ -31,7 +31,7 @@ import Data.Complex
31import Foreign.Marshal.Alloc(free) 31import Foreign.Marshal.Alloc(free)
32import Foreign.Marshal.Array(newArray) 32import Foreign.Marshal.Array(newArray)
33import Foreign.Ptr(Ptr) 33import Foreign.Ptr(Ptr)
34import Foreign.C.Types(CInt(..)) 34import Foreign.C.Types
35import System.IO.Unsafe(unsafePerformIO) 35import System.IO.Unsafe(unsafePerformIO)
36 36
37fromei x = fromIntegral (fromEnum x) :: CInt 37fromei x = fromIntegral (fromEnum x) :: CInt
diff --git a/lib/Numeric/LinearAlgebra/LAPACK.hs b/lib/Numeric/LinearAlgebra/LAPACK.hs
index 14e121b..d1aa564 100644
--- a/lib/Numeric/LinearAlgebra/LAPACK.hs
+++ b/lib/Numeric/LinearAlgebra/LAPACK.hs
@@ -47,7 +47,7 @@ import Numeric.Conversion
47import Numeric.GSL.Vector(vectorMapValR, FunCodeSV(Scale)) 47import Numeric.GSL.Vector(vectorMapValR, FunCodeSV(Scale))
48 48
49import Foreign.Ptr(nullPtr) 49import Foreign.Ptr(nullPtr)
50import Foreign.C.Types(CInt(..)) 50import Foreign.C.Types
51import Control.Monad(when) 51import Control.Monad(when)
52import System.IO.Unsafe(unsafePerformIO) 52import System.IO.Unsafe(unsafePerformIO)
53 53
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-11 07:29:11 +0000