diff options
-rw-r--r-- | THANKS | 5 | ||||
-rw-r--r-- | hmatrix.cabal | 2 | ||||
-rw-r--r-- | lib/Data/Packed/Internal/Vector.hs | 2 | ||||
-rw-r--r-- | lib/Numeric/Vector.hs | 1 |
4 files changed, 9 insertions, 1 deletions
@@ -95,3 +95,8 @@ module reorganization, monadic mapVectorM, and many other improvements. | |||
95 | - Duncan Coutts reported a problem with configure.hs and contributed | 95 | - Duncan Coutts reported a problem with configure.hs and contributed |
96 | a solution and a simplified Setup.lhs. | 96 | a solution and a simplified Setup.lhs. |
97 | 97 | ||
98 | - Mark Wright fixed the import of vector >= 0.8. | ||
99 | |||
100 | - Bas van Dijk fixed the import of vector >= 0.8, got rid of some | ||
101 | deprecation warnings and used more explicit imports. | ||
102 | |||
diff --git a/hmatrix.cabal b/hmatrix.cabal index e4e1f84..8a0457f 100644 --- a/hmatrix.cabal +++ b/hmatrix.cabal | |||
@@ -1,5 +1,5 @@ | |||
1 | Name: hmatrix | 1 | Name: hmatrix |
2 | Version: 0.11.2.0 | 2 | Version: 0.11.2.1 |
3 | License: GPL | 3 | License: GPL |
4 | License-file: LICENSE | 4 | License-file: LICENSE |
5 | Author: Alberto Ruiz | 5 | Author: Alberto Ruiz |
diff --git a/lib/Data/Packed/Internal/Vector.hs b/lib/Data/Packed/Internal/Vector.hs index e5a7782..43b3fd8 100644 --- a/lib/Data/Packed/Internal/Vector.hs +++ b/lib/Data/Packed/Internal/Vector.hs | |||
@@ -60,6 +60,8 @@ import Data.Vector.Storable(Vector, | |||
60 | unsafeToForeignPtr, | 60 | unsafeToForeignPtr, |
61 | unsafeFromForeignPtr, | 61 | unsafeFromForeignPtr, |
62 | unsafeWith) | 62 | unsafeWith) |
63 | #else | ||
64 | import Foreign.ForeignPtr(withForeignPtr) | ||
63 | #endif | 65 | #endif |
64 | 66 | ||
65 | #ifdef VECTOR | 67 | #ifdef VECTOR |
diff --git a/lib/Numeric/Vector.hs b/lib/Numeric/Vector.hs index 01637d5..5b72951 100644 --- a/lib/Numeric/Vector.hs +++ b/lib/Numeric/Vector.hs | |||
@@ -41,6 +41,7 @@ instance (Show a, Storable a) => (Show (Vector a)) where | |||
41 | 41 | ||
42 | #ifdef VECTOR | 42 | #ifdef VECTOR |
43 | 43 | ||
44 | #if !MIN_VERSION_vector(0,8,0) | ||
44 | instance (Element a, Read a) => Read (Vector a) where | 45 | instance (Element a, Read a) => Read (Vector a) where |
45 | readsPrec _ s = [(fromList . read $ listnums, rest)] | 46 | readsPrec _ s = [(fromList . read $ listnums, rest)] |
46 | where (thing,trest) = breakAt ']' s | 47 | where (thing,trest) = breakAt ']' s |