diff options
-rw-r--r-- | lib/Data/Packed/Internal/Common.hs | 2 | ||||
-rw-r--r-- | lib/Data/Packed/Internal/Matrix.hs | 2 | ||||
-rw-r--r-- | lib/Data/Packed/Internal/Signatures.hs | 6 | ||||
-rw-r--r-- | lib/Data/Packed/Internal/Vector.hs | 2 | ||||
-rw-r--r-- | lib/Numeric/ContainerBoot.hs | 1 | ||||
-rw-r--r-- | lib/Numeric/GSL/Differentiation.hs | 2 | ||||
-rw-r--r-- | lib/Numeric/GSL/Fitting.hs | 2 | ||||
-rw-r--r-- | lib/Numeric/GSL/Fourier.hs | 2 | ||||
-rw-r--r-- | lib/Numeric/GSL/Integration.hs | 2 | ||||
-rw-r--r-- | lib/Numeric/GSL/Internal.hs | 2 | ||||
-rw-r--r-- | lib/Numeric/GSL/Minimization.hs | 2 | ||||
-rw-r--r-- | lib/Numeric/GSL/ODE.hs | 2 | ||||
-rw-r--r-- | lib/Numeric/GSL/Polynomials.hs | 1 | ||||
-rw-r--r-- | lib/Numeric/GSL/Root.hs | 4 | ||||
-rw-r--r-- | lib/Numeric/GSL/Vector.hs | 2 | ||||
-rw-r--r-- | lib/Numeric/LinearAlgebra/LAPACK.hs | 2 |
16 files changed, 19 insertions, 17 deletions
diff --git a/lib/Data/Packed/Internal/Common.hs b/lib/Data/Packed/Internal/Common.hs index a8c3c3e..60e3444 100644 --- a/lib/Data/Packed/Internal/Common.hs +++ b/lib/Data/Packed/Internal/Common.hs | |||
@@ -27,7 +27,7 @@ module Data.Packed.Internal.Common( | |||
27 | import Foreign | 27 | import Foreign |
28 | import Control.Monad(when) | 28 | import Control.Monad(when) |
29 | import Foreign.C.String(peekCString) | 29 | import Foreign.C.String(peekCString) |
30 | import Foreign.C.Types | 30 | import Foreign.C.Types(CInt(..), CChar) |
31 | import Foreign.Storable.Complex() | 31 | import Foreign.Storable.Complex() |
32 | import Data.List(transpose,intersperse) | 32 | import Data.List(transpose,intersperse) |
33 | import Control.Exception as E | 33 | import Control.Exception as E |
diff --git a/lib/Data/Packed/Internal/Matrix.hs b/lib/Data/Packed/Internal/Matrix.hs index d5fa5a0..9fbaf6d 100644 --- a/lib/Data/Packed/Internal/Matrix.hs +++ b/lib/Data/Packed/Internal/Matrix.hs | |||
@@ -44,7 +44,7 @@ import Foreign.Marshal.Array(newArray) | |||
44 | import Foreign.Ptr(Ptr, castPtr) | 44 | import Foreign.Ptr(Ptr, castPtr) |
45 | import Foreign.Storable(Storable, peekElemOff, pokeElemOff, poke, sizeOf) | 45 | import Foreign.Storable(Storable, peekElemOff, pokeElemOff, poke, sizeOf) |
46 | import Data.Complex(Complex) | 46 | import Data.Complex(Complex) |
47 | import Foreign.C.Types(CInt, CChar) | 47 | import Foreign.C.Types(CInt(..), CChar) |
48 | import Foreign.C.String(newCString) | 48 | import Foreign.C.String(newCString) |
49 | import System.IO.Unsafe(unsafePerformIO) | 49 | import System.IO.Unsafe(unsafePerformIO) |
50 | 50 | ||
diff --git a/lib/Data/Packed/Internal/Signatures.hs b/lib/Data/Packed/Internal/Signatures.hs index b81efa4..2835720 100644 --- a/lib/Data/Packed/Internal/Signatures.hs +++ b/lib/Data/Packed/Internal/Signatures.hs | |||
@@ -14,9 +14,9 @@ | |||
14 | 14 | ||
15 | module Data.Packed.Internal.Signatures where | 15 | module Data.Packed.Internal.Signatures where |
16 | 16 | ||
17 | import Foreign | 17 | import Foreign.Ptr(Ptr) |
18 | import Data.Complex | 18 | import Data.Complex(Complex) |
19 | import Foreign.C.Types | 19 | import Foreign.C.Types(CInt) |
20 | 20 | ||
21 | type PF = Ptr Float -- | 21 | type PF = Ptr Float -- |
22 | type PD = Ptr Double -- | 22 | type PD = Ptr Double -- |
diff --git a/lib/Data/Packed/Internal/Vector.hs b/lib/Data/Packed/Internal/Vector.hs index 43b3fd8..5062bc0 100644 --- a/lib/Data/Packed/Internal/Vector.hs +++ b/lib/Data/Packed/Internal/Vector.hs | |||
@@ -38,7 +38,7 @@ import Foreign.ForeignPtr(ForeignPtr, castForeignPtr) | |||
38 | import Foreign.Ptr(Ptr) | 38 | import Foreign.Ptr(Ptr) |
39 | import Foreign.Storable(Storable, peekElemOff, pokeElemOff, sizeOf) | 39 | import Foreign.Storable(Storable, peekElemOff, pokeElemOff, sizeOf) |
40 | import Foreign.C.String | 40 | import Foreign.C.String |
41 | import Foreign.C.Types(CInt,CChar) | 41 | import Foreign.C.Types(CInt(..), CChar) |
42 | import Data.Complex | 42 | import Data.Complex |
43 | import Control.Monad(when) | 43 | import Control.Monad(when) |
44 | import System.IO.Unsafe(unsafePerformIO) | 44 | import System.IO.Unsafe(unsafePerformIO) |
diff --git a/lib/Numeric/ContainerBoot.hs b/lib/Numeric/ContainerBoot.hs index f1ed7c5..fb783ce 100644 --- a/lib/Numeric/ContainerBoot.hs +++ b/lib/Numeric/ContainerBoot.hs | |||
@@ -49,6 +49,7 @@ import Data.Packed.ST as ST | |||
49 | import Numeric.Conversion | 49 | import Numeric.Conversion |
50 | import Data.Packed.Internal | 50 | import Data.Packed.Internal |
51 | import Numeric.GSL.Vector | 51 | import Numeric.GSL.Vector |
52 | import Foreign.C.Types(CInt(..)) | ||
52 | 53 | ||
53 | import Data.Complex | 54 | import Data.Complex |
54 | import Control.Monad(ap) | 55 | import Control.Monad(ap) |
diff --git a/lib/Numeric/GSL/Differentiation.hs b/lib/Numeric/GSL/Differentiation.hs index a3c1aea..1df58a1 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 | ||
25 | import Foreign.C.Types(CInt) | 25 | import Foreign.C.Types(CInt(..)) |
26 | import Foreign.Marshal.Alloc(malloc, free) | 26 | import Foreign.Marshal.Alloc(malloc, free) |
27 | import Foreign.Ptr(Ptr, FunPtr, freeHaskellFunPtr) | 27 | import Foreign.Ptr(Ptr, FunPtr, freeHaskellFunPtr) |
28 | import Foreign.Storable(peek) | 28 | import Foreign.Storable(peek) |
diff --git a/lib/Numeric/GSL/Fitting.hs b/lib/Numeric/GSL/Fitting.hs index 337dc6a..da5c0fc 100644 --- a/lib/Numeric/GSL/Fitting.hs +++ b/lib/Numeric/GSL/Fitting.hs | |||
@@ -54,7 +54,7 @@ import Numeric.LinearAlgebra | |||
54 | import Numeric.GSL.Internal | 54 | import Numeric.GSL.Internal |
55 | 55 | ||
56 | import Foreign.Ptr(FunPtr, freeHaskellFunPtr) | 56 | import Foreign.Ptr(FunPtr, freeHaskellFunPtr) |
57 | import Foreign.C.Types(CInt) | 57 | import Foreign.C.Types(CInt(..)) |
58 | import System.IO.Unsafe(unsafePerformIO) | 58 | import System.IO.Unsafe(unsafePerformIO) |
59 | 59 | ||
60 | ------------------------------------------------------------------------- | 60 | ------------------------------------------------------------------------- |
diff --git a/lib/Numeric/GSL/Fourier.hs b/lib/Numeric/GSL/Fourier.hs index 25487d4..5cc50dc 100644 --- a/lib/Numeric/GSL/Fourier.hs +++ b/lib/Numeric/GSL/Fourier.hs | |||
@@ -22,7 +22,7 @@ module Numeric.GSL.Fourier ( | |||
22 | 22 | ||
23 | import Data.Packed.Internal | 23 | import Data.Packed.Internal |
24 | import Data.Complex | 24 | import Data.Complex |
25 | import Foreign.C.Types(CInt) | 25 | import Foreign.C.Types(CInt(..)) |
26 | import System.IO.Unsafe (unsafePerformIO) | 26 | import System.IO.Unsafe (unsafePerformIO) |
27 | 27 | ||
28 | genfft code v = unsafePerformIO $ do | 28 | genfft code v = unsafePerformIO $ do |
diff --git a/lib/Numeric/GSL/Integration.hs b/lib/Numeric/GSL/Integration.hs index 84e8546..a59862a 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 | ||
23 | import Foreign.C.Types(CInt) | 23 | import Foreign.C.Types(CInt(..)) |
24 | import Foreign.Marshal.Alloc(malloc, free) | 24 | import Foreign.Marshal.Alloc(malloc, free) |
25 | import Foreign.Ptr(Ptr, FunPtr, freeHaskellFunPtr) | 25 | import Foreign.Ptr(Ptr, FunPtr, freeHaskellFunPtr) |
26 | import Foreign.Storable(peek) | 26 | import Foreign.Storable(peek) |
diff --git a/lib/Numeric/GSL/Internal.hs b/lib/Numeric/GSL/Internal.hs index db2c633..a6c81ee 100644 --- a/lib/Numeric/GSL/Internal.hs +++ b/lib/Numeric/GSL/Internal.hs | |||
@@ -16,7 +16,7 @@ import Data.Packed.Internal | |||
16 | 16 | ||
17 | import Foreign.Marshal.Array(copyArray) | 17 | import Foreign.Marshal.Array(copyArray) |
18 | import Foreign.Ptr(Ptr, FunPtr) | 18 | import Foreign.Ptr(Ptr, FunPtr) |
19 | import Foreign.C.Types(CInt) | 19 | import Foreign.C.Types(CInt(..)) |
20 | import System.IO.Unsafe(unsafePerformIO) | 20 | import System.IO.Unsafe(unsafePerformIO) |
21 | 21 | ||
22 | iv :: (Vector Double -> Double) -> (CInt -> Ptr Double -> Double) | 22 | iv :: (Vector Double -> Double) -> (CInt -> Ptr Double -> Double) |
diff --git a/lib/Numeric/GSL/Minimization.hs b/lib/Numeric/GSL/Minimization.hs index 5770c91..6fac640 100644 --- a/lib/Numeric/GSL/Minimization.hs +++ b/lib/Numeric/GSL/Minimization.hs | |||
@@ -65,7 +65,7 @@ import Data.Packed.Matrix | |||
65 | import Numeric.GSL.Internal | 65 | import Numeric.GSL.Internal |
66 | 66 | ||
67 | import Foreign.Ptr(Ptr, FunPtr, freeHaskellFunPtr) | 67 | import Foreign.Ptr(Ptr, FunPtr, freeHaskellFunPtr) |
68 | import Foreign.C.Types(CInt) | 68 | import Foreign.C.Types(CInt(..)) |
69 | import System.IO.Unsafe(unsafePerformIO) | 69 | import System.IO.Unsafe(unsafePerformIO) |
70 | 70 | ||
71 | ------------------------------------------------------------------------ | 71 | ------------------------------------------------------------------------ |
diff --git a/lib/Numeric/GSL/ODE.hs b/lib/Numeric/GSL/ODE.hs index ea064d6..86c8bab 100644 --- a/lib/Numeric/GSL/ODE.hs +++ b/lib/Numeric/GSL/ODE.hs | |||
@@ -36,7 +36,7 @@ import Data.Packed.Internal | |||
36 | import Numeric.GSL.Internal | 36 | import Numeric.GSL.Internal |
37 | 37 | ||
38 | import Foreign.Ptr(FunPtr, nullFunPtr, freeHaskellFunPtr) | 38 | import Foreign.Ptr(FunPtr, nullFunPtr, freeHaskellFunPtr) |
39 | import Foreign.C.Types(CInt) | 39 | import Foreign.C.Types(CInt(..)) |
40 | import System.IO.Unsafe(unsafePerformIO) | 40 | import System.IO.Unsafe(unsafePerformIO) |
41 | 41 | ||
42 | ------------------------------------------------------------------------- | 42 | ------------------------------------------------------------------------- |
diff --git a/lib/Numeric/GSL/Polynomials.hs b/lib/Numeric/GSL/Polynomials.hs index 9885920..903c678 100644 --- a/lib/Numeric/GSL/Polynomials.hs +++ b/lib/Numeric/GSL/Polynomials.hs | |||
@@ -21,6 +21,7 @@ module Numeric.GSL.Polynomials ( | |||
21 | 21 | ||
22 | import Data.Packed.Internal | 22 | import Data.Packed.Internal |
23 | import Data.Complex | 23 | import Data.Complex |
24 | import Foreign.C.Types(CInt(..)) | ||
24 | import System.IO.Unsafe (unsafePerformIO) | 25 | import System.IO.Unsafe (unsafePerformIO) |
25 | 26 | ||
26 | {- | Solution of general polynomial equations, using /gsl_poly_complex_solve/. For example, | 27 | {- | Solution of general polynomial equations, using /gsl_poly_complex_solve/. For example, |
diff --git a/lib/Numeric/GSL/Root.hs b/lib/Numeric/GSL/Root.hs index 784bbd4..5dfd4d7 100644 --- a/lib/Numeric/GSL/Root.hs +++ b/lib/Numeric/GSL/Root.hs | |||
@@ -53,8 +53,8 @@ import Data.Packed.Internal | |||
53 | import Data.Packed.Matrix | 53 | import Data.Packed.Matrix |
54 | import Numeric.GSL.Internal | 54 | import Numeric.GSL.Internal |
55 | 55 | ||
56 | import Foreign.Ptr(FunPtr, freeHaskellFunPtr) | 56 | import Foreign.Ptr(FunPtr, freeHaskellFunPtr) |
57 | import Foreign.C.Types(CInt) | 57 | import Foreign.C.Types(CInt(..)) |
58 | import System.IO.Unsafe(unsafePerformIO) | 58 | import System.IO.Unsafe(unsafePerformIO) |
59 | 59 | ||
60 | ------------------------------------------------------------------------- | 60 | ------------------------------------------------------------------------- |
diff --git a/lib/Numeric/GSL/Vector.hs b/lib/Numeric/GSL/Vector.hs index e912953..d0f419b 100644 --- a/lib/Numeric/GSL/Vector.hs +++ b/lib/Numeric/GSL/Vector.hs | |||
@@ -31,7 +31,7 @@ import Data.Complex | |||
31 | import Foreign.Marshal.Alloc(free) | 31 | import Foreign.Marshal.Alloc(free) |
32 | import Foreign.Marshal.Array(newArray) | 32 | import Foreign.Marshal.Array(newArray) |
33 | import Foreign.Ptr(Ptr) | 33 | import Foreign.Ptr(Ptr) |
34 | import Foreign.C.Types(CInt) | 34 | import Foreign.C.Types(CInt(..)) |
35 | import System.IO.Unsafe(unsafePerformIO) | 35 | import System.IO.Unsafe(unsafePerformIO) |
36 | 36 | ||
37 | fromei x = fromIntegral (fromEnum x) :: CInt | 37 | fromei x = fromIntegral (fromEnum x) :: CInt |
diff --git a/lib/Numeric/LinearAlgebra/LAPACK.hs b/lib/Numeric/LinearAlgebra/LAPACK.hs index 2fac1ee..14e121b 100644 --- a/lib/Numeric/LinearAlgebra/LAPACK.hs +++ b/lib/Numeric/LinearAlgebra/LAPACK.hs | |||
@@ -47,7 +47,7 @@ import Numeric.Conversion | |||
47 | import Numeric.GSL.Vector(vectorMapValR, FunCodeSV(Scale)) | 47 | import Numeric.GSL.Vector(vectorMapValR, FunCodeSV(Scale)) |
48 | 48 | ||
49 | import Foreign.Ptr(nullPtr) | 49 | import Foreign.Ptr(nullPtr) |
50 | import Foreign.C.Types(CInt) | 50 | import Foreign.C.Types(CInt(..)) |
51 | import Control.Monad(when) | 51 | import Control.Monad(when) |
52 | import System.IO.Unsafe(unsafePerformIO) | 52 | import System.IO.Unsafe(unsafePerformIO) |
53 | 53 | ||