diff options
author | Adam Vogt <vogt.adam@gmail.com> | 2014-01-30 01:47:39 -0500 |
---|---|---|
committer | Adam Vogt <vogt.adam@gmail.com> | 2014-01-30 01:52:35 -0500 |
commit | b60cffc90daa55c82d0190965d51588aa7d1edce (patch) | |
tree | d1591264f97ff30dc2c39201a27986585f6d46a0 /lib/Data/Packed/Internal/Matrix.hs | |
parent | 4382cadadfb4b9312c49fa5fe51537f60a7e2f54 (diff) |
rename variables so Prelude.join will not cause problems
* background:
http://www.haskell.org/haskellwiki/Functor-Applicative-Monad_Proposal#Current_stage:_Prepare_GHC
* the change happens in ghc-7.10, and these changes fix warnings with 7.8
Diffstat (limited to 'lib/Data/Packed/Internal/Matrix.hs')
-rw-r--r-- | lib/Data/Packed/Internal/Matrix.hs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/Data/Packed/Internal/Matrix.hs b/lib/Data/Packed/Internal/Matrix.hs index 255009c..7504b39 100644 --- a/lib/Data/Packed/Internal/Matrix.hs +++ b/lib/Data/Packed/Internal/Matrix.hs | |||
@@ -154,7 +154,7 @@ toLists m = splitEvery (cols m) . toList . flatten $ m | |||
154 | fromRows :: Element t => [Vector t] -> Matrix t | 154 | fromRows :: Element t => [Vector t] -> Matrix t |
155 | fromRows vs = case compatdim (map dim vs) of | 155 | fromRows vs = case compatdim (map dim vs) of |
156 | Nothing -> error "fromRows applied to [] or to vectors with different sizes" | 156 | Nothing -> error "fromRows applied to [] or to vectors with different sizes" |
157 | Just c -> reshape c . join . map (adapt c) $ vs | 157 | Just c -> reshape c . Data.Packed.Internal.Vector.join . map (adapt c) $ vs |
158 | where | 158 | where |
159 | adapt c v | dim v == c = v | 159 | adapt c v | dim v == c = v |
160 | | otherwise = constantD (v@>0) c | 160 | | otherwise = constantD (v@>0) c |