ok also with ghc-7.0

6 files changed, 44 insertions, 25 deletions

diff --git a/hmatrix.cabal b/hmatrix.cabal
index 387e4e6..79ac491 100644
--- a/hmatrix.cabal
+++ b/hmatrix.cabal
@@ -148,9 +148,16 @@ library
 
  -- ghc-prof-options:   -auto
 
-    ghc-options:        -Wall -fno-warn-missing-signatures
-                              -fno-warn-orphans
-                              -fno-warn-unused-binds
+
+    if impl(ghc < 7.4)
+        ghc-options:  -Wall -fno-warn-missing-signatures
+                            -fno-warn-orphans
+                            -fno-warn-unused-binds
+                            -fno-warn-dodgy-imports
+    else 
+        ghc-options:  -Wall -fno-warn-missing-signatures
+                            -fno-warn-orphans
+                            -fno-warn-unused-binds
 
     if flag(unsafe)
         cpp-options: -DUNSAFE
@@ -179,6 +186,9 @@ library
     if impl(ghc == 7.0.1)
         cpp-options: -DNONORMVTEST
 
+    if impl(ghc < 7.4)
+        cpp-options: -DNOPOLYKINDS -DABSTRACTCINT
+
     if flag(mkl)
       if arch(x86_64)
         extra-libraries:   gsl mkl_lapack mkl_intel_lp64 mkl_sequential mkl_core
diff --git a/lib/Data/Packed/Internal/Vector.hs b/lib/Data/Packed/Internal/Vector.hs
index f48c4b2..e85ba6e 100644
--- a/lib/Data/Packed/Internal/Vector.hs
+++ b/lib/Data/Packed/Internal/Vector.hs
@@ -23,6 +23,7 @@ module Data.Packed.Internal.Vector (
     createVector, vec,
     asComplex, asReal, float2DoubleV, double2FloatV,
     stepF, stepD, condF, condD,
+    conjugateQ, conjugateC,
     fwriteVector, freadVector, fprintfVector, fscanfVector,
     cloneVector,
     unsafeToForeignPtr,
@@ -344,7 +345,22 @@ condD x y l e g = unsafePerformIO $ do
 foreign import ccall "condF" c_condF :: CInt -> PF -> CInt -> PF -> CInt -> PF -> TFFF
 foreign import ccall "condD" c_condD :: CInt -> PD -> CInt -> PD -> CInt -> PD -> TVVV
 
-----------------------------------------------------------------
+--------------------------------------------------------------------------------
+
+conjugateAux fun x = unsafePerformIO $ do
+    v <- createVector (dim x)
+    app2 fun vec x vec v "conjugateAux"
+    return v
+
+conjugateQ :: Vector (Complex Float) -> Vector (Complex Float)
+conjugateQ = conjugateAux c_conjugateQ
+foreign import ccall "conjugateQ" c_conjugateQ :: TQVQV
+
+conjugateC :: Vector (Complex Double) -> Vector (Complex Double)
+conjugateC = conjugateAux c_conjugateC
+foreign import ccall "conjugateC" c_conjugateC :: TCVCV
+
+--------------------------------------------------------------------------------
 
 cloneVector :: Storable t => Vector t -> IO (Vector t)
 cloneVector v = do
diff --git a/lib/Numeric/ContainerBoot.hs b/lib/Numeric/ContainerBoot.hs
index d913435..6ce4760 100644
--- a/lib/Numeric/ContainerBoot.hs
+++ b/lib/Numeric/ContainerBoot.hs
@@ -3,7 +3,9 @@
 {-# LANGUAGE FlexibleInstances #-}
 {-# LANGUAGE MultiParamTypeClasses #-}
 {-# LANGUAGE UndecidableInstances #-}
+#ifndef NOPOLYKINDS
 {-# LANGUAGE PolyKinds #-}
+#endif
 
 -----------------------------------------------------------------------------
 -- |
@@ -46,14 +48,11 @@ import Data.Packed.ST as ST
 import Numeric.Conversion
 import Data.Packed.Internal
 import Numeric.GSL.Vector
-import Foreign.C.Types(CInt(..))
 import Data.Complex
 import Control.Monad(ap)
 
 import Numeric.LinearAlgebra.LAPACK(multiplyR,multiplyC,multiplyF,multiplyQ)
 
-import System.IO.Unsafe
-
 -------------------------------------------------------------------
 
 type family IndexOf c
@@ -510,21 +509,6 @@ type instance ElementOf (Matrix a) = a
 
 ------------------------------------------------------------
 
-conjugateAux fun x = unsafePerformIO $ do
-    v <- createVector (dim x)
-    app2 fun vec x vec v "conjugateAux"
-    return v
-
-conjugateQ :: Vector (Complex Float) -> Vector (Complex Float)
-conjugateQ = conjugateAux c_conjugateQ
-foreign import ccall "conjugateQ" c_conjugateQ :: TQVQV
-
-conjugateC :: Vector (Complex Double) -> Vector (Complex Double)
-conjugateC = conjugateAux c_conjugateC
-foreign import ccall "conjugateC" c_conjugateC :: TCVCV
-
------------------------------------------------------
-
 class Build f where
     build' :: BoundsOf f -> f -> ContainerOf f
 
diff --git a/lib/Numeric/GSL/Polynomials.hs b/lib/Numeric/GSL/Polynomials.hs
index 9d1cf8c..c0318d7 100644
--- a/lib/Numeric/GSL/Polynomials.hs
+++ b/lib/Numeric/GSL/Polynomials.hs
@@ -19,7 +19,9 @@ module Numeric.GSL.Polynomials (
     polySolve
 ) where
 
+#ifndef ABSTRACTCINT
 import Foreign.C.Types(CInt(..))
+#endif
 import Data.Packed.Internal
 import Data.Complex
 import System.IO.Unsafe (unsafePerformIO)
diff --git a/packages/glpk/hmatrix-glpk.cabal b/packages/glpk/hmatrix-glpk.cabal
index ea6d0ce..3231ef7 100644
--- a/packages/glpk/hmatrix-glpk.cabal
+++ b/packages/glpk/hmatrix-glpk.cabal
@@ -30,7 +30,10 @@ library
 
     c-sources:          lib/Numeric/LinearProgramming/glpk.c
 
-    ghc-options:        -Wall
+    if impl(ghc < 7.4)
+        ghc-options:  -Wall -fno-warn-dodgy-imports
+    else 
+        ghc-options:  -Wall
 
     extra-libraries:    glpk
 
diff --git a/packages/special/hmatrix-special.cabal b/packages/special/hmatrix-special.cabal
index 4dd884b..25880a9 100644
--- a/packages/special/hmatrix-special.cabal
+++ b/packages/special/hmatrix-special.cabal
@@ -66,8 +66,12 @@ library
 
     other-modules:      Numeric.GSL.Special.Internal
 
-    ghc-options:        -Wall -fno-warn-unused-binds
-
+    if impl(ghc < 7.4)
+        ghc-options:  -Wall -fno-warn-unused-binds
+                            -fno-warn-dodgy-imports
+    else 
+        ghc-options:  -Wall -fno-warn-orphans
+                            
     if flag(safe-cheap)
         cpp-options: -DSAFE_CHEAP=safe
     else