diff options
author | Alberto Ruiz <aruiz@um.es> | 2017-12-26 14:05:35 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-12-26 14:05:35 +0100 |
commit | 0d4018b09f1d38bbc05fdc0d8197d0f8a6ce5571 (patch) | |
tree | f7aae740fa7129c4641cf05a9e00260e48cd92bb /packages/base/src/Internal | |
parent | 87c7682bbfd17308749d5e9568f1ffa25390ce79 (diff) | |
parent | e83e2023da77ecaa9aaba15bc9bd48757f73b3a9 (diff) |
Merge pull request #245 from konn/ghc84
Workaround for GHC-8.4.x
Diffstat (limited to 'packages/base/src/Internal')
-rw-r--r-- | packages/base/src/Internal/Container.hs | 5 | ||||
-rw-r--r-- | packages/base/src/Internal/Convolution.hs | 4 | ||||
-rw-r--r-- | packages/base/src/Internal/Modular.hs | 8 | ||||
-rw-r--r-- | packages/base/src/Internal/Util.hs | 4 |
4 files changed, 20 insertions, 1 deletions
diff --git a/packages/base/src/Internal/Container.hs b/packages/base/src/Internal/Container.hs index b379530..1520489 100644 --- a/packages/base/src/Internal/Container.hs +++ b/packages/base/src/Internal/Container.hs | |||
@@ -1,3 +1,4 @@ | |||
1 | {-# LANGUAGE CPP #-} | ||
1 | {-# LANGUAGE FlexibleContexts #-} | 2 | {-# LANGUAGE FlexibleContexts #-} |
2 | {-# LANGUAGE FlexibleInstances #-} | 3 | {-# LANGUAGE FlexibleInstances #-} |
3 | {-# LANGUAGE MultiParamTypeClasses #-} | 4 | {-# LANGUAGE MultiParamTypeClasses #-} |
@@ -29,7 +30,9 @@ import Internal.Matrix | |||
29 | import Internal.Element | 30 | import Internal.Element |
30 | import Internal.Numeric | 31 | import Internal.Numeric |
31 | import Internal.Algorithms(Field,linearSolveSVD,Herm,mTm) | 32 | import Internal.Algorithms(Field,linearSolveSVD,Herm,mTm) |
32 | 33 | #if MIN_VERSION_base(4,11,0) | |
34 | import Prelude hiding ((<>)) | ||
35 | #endif | ||
33 | ------------------------------------------------------------------ | 36 | ------------------------------------------------------------------ |
34 | 37 | ||
35 | {- | Creates a real vector containing a range of values: | 38 | {- | Creates a real vector containing a range of values: |
diff --git a/packages/base/src/Internal/Convolution.hs b/packages/base/src/Internal/Convolution.hs index 384fdf8..004e1ff 100644 --- a/packages/base/src/Internal/Convolution.hs +++ b/packages/base/src/Internal/Convolution.hs | |||
@@ -1,3 +1,4 @@ | |||
1 | {-# LANGUAGE CPP #-} | ||
1 | {-# LANGUAGE FlexibleContexts #-} | 2 | {-# LANGUAGE FlexibleContexts #-} |
2 | ----------------------------------------------------------------------------- | 3 | ----------------------------------------------------------------------------- |
3 | {- | | 4 | {- | |
@@ -23,6 +24,9 @@ import Internal.Numeric | |||
23 | import Internal.Element | 24 | import Internal.Element |
24 | import Internal.Conversion | 25 | import Internal.Conversion |
25 | import Internal.Container | 26 | import Internal.Container |
27 | #if MIN_VERSION_base(4,11,0) | ||
28 | import Prelude hiding ((<>)) | ||
29 | #endif | ||
26 | 30 | ||
27 | 31 | ||
28 | vectSS :: Element t => Int -> Vector t -> Matrix t | 32 | vectSS :: Element t => Int -> Vector t -> Matrix t |
diff --git a/packages/base/src/Internal/Modular.hs b/packages/base/src/Internal/Modular.hs index f3c59a8..9d51444 100644 --- a/packages/base/src/Internal/Modular.hs +++ b/packages/base/src/Internal/Modular.hs | |||
@@ -1,3 +1,4 @@ | |||
1 | {-# LANGUAGE CPP #-} | ||
1 | {-# LANGUAGE DataKinds #-} | 2 | {-# LANGUAGE DataKinds #-} |
2 | {-# LANGUAGE KindSignatures #-} | 3 | {-# LANGUAGE KindSignatures #-} |
3 | {-# LANGUAGE GeneralizedNewtypeDeriving #-} | 4 | {-# LANGUAGE GeneralizedNewtypeDeriving #-} |
@@ -38,13 +39,20 @@ import Internal.Util(Normed(..),Indexable(..), | |||
38 | gaussElim, gaussElim_1, gaussElim_2, | 39 | gaussElim, gaussElim_1, gaussElim_2, |
39 | luST, luSolve', luPacked', magnit, invershur) | 40 | luST, luSolve', luPacked', magnit, invershur) |
40 | import Internal.ST(mutable) | 41 | import Internal.ST(mutable) |
42 | #if MIN_VERSION_base(4,11,0) | ||
43 | import GHC.TypeLits hiding (Mod) | ||
44 | #else | ||
41 | import GHC.TypeLits | 45 | import GHC.TypeLits |
46 | #endif | ||
42 | import Data.Proxy(Proxy) | 47 | import Data.Proxy(Proxy) |
43 | import Foreign.ForeignPtr(castForeignPtr) | 48 | import Foreign.ForeignPtr(castForeignPtr) |
44 | import Foreign.Storable | 49 | import Foreign.Storable |
45 | import Data.Ratio | 50 | import Data.Ratio |
46 | import Data.Complex | 51 | import Data.Complex |
47 | import Control.DeepSeq ( NFData(..) ) | 52 | import Control.DeepSeq ( NFData(..) ) |
53 | #if MIN_VERSION_base(4,11,0) | ||
54 | import Prelude hiding ((<>)) | ||
55 | #endif | ||
48 | 56 | ||
49 | 57 | ||
50 | 58 | ||
diff --git a/packages/base/src/Internal/Util.hs b/packages/base/src/Internal/Util.hs index ec21fe4..8c8a31e 100644 --- a/packages/base/src/Internal/Util.hs +++ b/packages/base/src/Internal/Util.hs | |||
@@ -1,3 +1,4 @@ | |||
1 | {-# LANGUAGE CPP #-} | ||
1 | {-# LANGUAGE FlexibleContexts #-} | 2 | {-# LANGUAGE FlexibleContexts #-} |
2 | {-# LANGUAGE FlexibleInstances #-} | 3 | {-# LANGUAGE FlexibleInstances #-} |
3 | {-# LANGUAGE MultiParamTypeClasses #-} | 4 | {-# LANGUAGE MultiParamTypeClasses #-} |
@@ -80,6 +81,9 @@ import Control.Arrow((&&&),(***)) | |||
80 | import Data.Complex | 81 | import Data.Complex |
81 | import Data.Function(on) | 82 | import Data.Function(on) |
82 | import Internal.ST | 83 | import Internal.ST |
84 | #if MIN_VERSION_base(4,11,0) | ||
85 | import Prelude hiding ((<>)) | ||
86 | #endif | ||
83 | 87 | ||
84 | type ℝ = Double | 88 | type ℝ = Double |
85 | type ℕ = Int | 89 | type ℕ = Int |