Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : master
http://hackage.haskell.org/trac/ghc/changeset/1679a75ecb6ed1136cceeea57f43690515418366 >--------------------------------------------------------------- commit 1679a75ecb6ed1136cceeea57f43690515418366 Author: Simon Peyton Jones <[email protected]> Date: Tue Aug 2 13:34:06 2011 +0100 Fix import DEPRECATE failures for castSTUArray >--------------------------------------------------------------- compiler/cmm/PprC.hs | 7 +++++++ compiler/ghci/ByteCodeAsm.lhs | 7 +++++++ compiler/nativeGen/PprBase.hs | 7 +++++++ 3 files changed, 21 insertions(+), 0 deletions(-) diff --git a/compiler/cmm/PprC.hs b/compiler/cmm/PprC.hs index b48d2de..cad5c89 100644 --- a/compiler/cmm/PprC.hs +++ b/compiler/cmm/PprC.hs @@ -48,7 +48,14 @@ import Data.Map (Map) import qualified Data.Map as Map import Data.Word +-- castSTUArray has moved to Data.Array.Unsafe +#if __GLASGOW_HASKELL__ >= 701 +import Data.Array.Unsafe( castSTUArray ) +import Data.Array.ST hiding( castSTUArray ) +#else import Data.Array.ST +#endif + import Control.Monad.ST #if defined(alpha_TARGET_ARCH) || defined(mips_TARGET_ARCH) || defined(mipsel_TARGET_ARCH) || defined(arm_TARGET_ARCH) diff --git a/compiler/ghci/ByteCodeAsm.lhs b/compiler/ghci/ByteCodeAsm.lhs index af9fbe9..fa87543 100644 --- a/compiler/ghci/ByteCodeAsm.lhs +++ b/compiler/ghci/ByteCodeAsm.lhs @@ -40,7 +40,14 @@ import Control.Monad.ST ( runST ) import Data.Array.MArray import Data.Array.Unboxed ( listArray ) import Data.Array.Base ( UArray(..) ) + +-- castSTUArray has moved to Data.Array.Unsafe +#if __GLASGOW_HASKELL__ >= 701 +import Data.Array.Unsafe( castSTUArray ) +#else import Data.Array.ST ( castSTUArray ) +#endif + import Foreign import Data.Char ( ord ) import Data.List diff --git a/compiler/nativeGen/PprBase.hs b/compiler/nativeGen/PprBase.hs index 5039ae7..5781e89 100644 --- a/compiler/nativeGen/PprBase.hs +++ b/compiler/nativeGen/PprBase.hs @@ -21,7 +21,14 @@ import qualified Outputable import CLabel import Pretty +-- castSTUArray has moved to Data.Array.Unsafe +#if __GLASGOW_HASKELL__ >= 701 +import Data.Array.Unsafe( castSTUArray ) +import Data.Array.ST hiding( castSTUArray ) +#else import Data.Array.ST +#endif + import Control.Monad.ST import Data.Word _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
