[commit: packages/dph] wip/dph-fix: Applicative-Monad fixes. (33a0c42)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/dph

On branch  : wip/dph-fix
Link       : http://git.haskell.org/packages/dph.git/commitdiff/33a0c42e76a258f63b1812d7c4e3ac7990c9cf5d

>---------------------------------------------------------------

commit 33a0c42e76a258f63b1812d7c4e3ac7990c9cf5d
Author: Geoffrey Mainland <mainland at apeiron.net>
Date:   Wed Aug 27 15:45:54 2014 -0400

    Applicative-Monad fixes.


>---------------------------------------------------------------

33a0c42e76a258f63b1812d7c4e3ac7990c9cf5d
 dph-lifted-base/Data/Array/Parallel/PArray/Reference.hs                 | 2 +-
 dph-lifted-boxed/Data/Array/Parallel/PArray.hs                          | 2 +-
 .../Data/Array/Parallel/Unlifted/Distributed/Primitive/DistST.hs        | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/dph-lifted-base/Data/Array/Parallel/PArray/Reference.hs b/dph-lifted-base/Data/Array/Parallel/PArray/Reference.hs
index a98ffdc..3bcf736 100644
--- a/dph-lifted-base/Data/Array/Parallel/PArray/Reference.hs
+++ b/dph-lifted-base/Data/Array/Parallel/PArray/Reference.hs
@@ -55,7 +55,7 @@ import Data.Array.Parallel.Base                 (Tag)
 import Data.Vector                              (Vector)
 import qualified Data.Array.Parallel.Unlifted   as U
 import qualified Data.Vector                    as V
-import Control.Monad hiding ( empty )
+import Control.Monad
 import Prelude hiding
         ( replicate, length, concat
         , enumFromTo
diff --git a/dph-lifted-boxed/Data/Array/Parallel/PArray.hs b/dph-lifted-boxed/Data/Array/Parallel/PArray.hs
index 3b6b6f1..d19b795 100644
--- a/dph-lifted-boxed/Data/Array/Parallel/PArray.hs
+++ b/dph-lifted-boxed/Data/Array/Parallel/PArray.hs
@@ -59,7 +59,7 @@ import Data.Vector                              (Vector)
 import qualified Data.Array.Parallel.Unlifted   as U
 import qualified Data.Array.Parallel.Array      as A
 import qualified Data.Vector                    as V
-import Control.Monad hiding (empty)
+import Control.Monad
 import GHC.Exts (Int(I#), (+#))
 import qualified Prelude                        as P
 import Prelude hiding
diff --git a/dph-prim-par/Data/Array/Parallel/Unlifted/Distributed/Primitive/DistST.hs b/dph-prim-par/Data/Array/Parallel/Unlifted/Distributed/Primitive/DistST.hs
index cdabbda..4349df4 100644
--- a/dph-prim-par/Data/Array/Parallel/Unlifted/Distributed/Primitive/DistST.hs
+++ b/dph-prim-par/Data/Array/Parallel/Unlifted/Distributed/Primitive/DistST.hs
@@ -31,6 +31,7 @@ import Data.Array.Parallel.Unlifted.Distributed.Primitive.DT
 import Data.Array.Parallel.Unlifted.Distributed.Primitive.Gang
 import Data.Array.Parallel.Unlifted.Distributed.Data.Tuple
 import Data.Array.Parallel.Base (ST, runST)
+import Control.Applicative (Applicative(..))
 import Control.Monad (liftM, ap)