From b60cffc90daa55c82d0190965d51588aa7d1edce Mon Sep 17 00:00:00 2001 From: Adam Vogt Date: Thu, 30 Jan 2014 01:47:39 -0500 Subject: 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 --- lib/Data/Packed/Internal/Matrix.hs | 2 +- lib/Data/Packed/Internal/Vector.hs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/Data') 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 fromRows :: Element t => [Vector t] -> Matrix t fromRows vs = case compatdim (map dim vs) of Nothing -> error "fromRows applied to [] or to vectors with different sizes" - Just c -> reshape c . join . map (adapt c) $ vs + Just c -> reshape c . Data.Packed.Internal.Vector.join . map (adapt c) $ vs where adapt c v | dim v == c = v | otherwise = constantD (v@>0) c diff --git a/lib/Data/Packed/Internal/Vector.hs b/lib/Data/Packed/Internal/Vector.hs index 85e7f4f..c99f4f0 100644 --- a/lib/Data/Packed/Internal/Vector.hs +++ b/lib/Data/Packed/Internal/Vector.hs @@ -16,7 +16,7 @@ module Data.Packed.Internal.Vector ( Vector, dim, fromList, toList, (|>), - join, (@>), safe, at, at', subVector, takesV, + Data.Packed.Internal.Vector.join, (@>), safe, at, at', subVector, takesV, mapVector, mapVectorWithIndex, zipVectorWith, unzipVectorWith, mapVectorM, mapVectorM_, mapVectorWithIndexM, mapVectorWithIndexM_, foldVector, foldVectorG, foldLoop, foldVectorWithIndex, -- cgit v1.2.3