diff options
| author | Herbert Valerio Riedel <hvr@gnu.org> | 2013-10-11 21:24:31 +0200 |
|---|---|---|
| committer | Herbert Valerio Riedel <hvr@gnu.org> | 2013-10-11 21:24:31 +0200 |
| commit | abc910df622e11a20fb858750038c7ffa5767d2c (patch) | |
| tree | 23bd611acbe1386990b1a2621301fd1a32749a9b | |
| parent | 83be3d7b8881eca63adf834e425e6799e572bd1f (diff) | |
| download | haskell-abc910df622e11a20fb858750038c7ffa5767d2c.tar.gz | |
Future-proof code for upcoming `array-0.5.0.0`
This way CPP conditionals can be avoided for the transition period.
Signed-off-by: Herbert Valerio Riedel <hvr@gnu.org>
| -rw-r--r-- | compiler/cmm/PprC.hs | 8 | ||||
| -rw-r--r-- | compiler/nativeGen/PprBase.hs | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/compiler/cmm/PprC.hs b/compiler/cmm/PprC.hs index 32fd8b4feb..a8d4c5e360 100644 --- a/compiler/cmm/PprC.hs +++ b/compiler/cmm/PprC.hs @@ -55,8 +55,8 @@ import qualified Data.Map as Map import Control.Monad (liftM, ap) import Control.Applicative (Applicative(..)) -import Data.Array.Unsafe ( castSTUArray ) -import Data.Array.ST hiding ( castSTUArray ) +import qualified Data.Array.Unsafe as U ( castSTUArray ) +import Data.Array.ST -- -------------------------------------------------------------------------- -- Top level @@ -1162,10 +1162,10 @@ big_doubles dflags | otherwise = panic "big_doubles" castFloatToIntArray :: STUArray s Int Float -> ST s (STUArray s Int Int) -castFloatToIntArray = castSTUArray +castFloatToIntArray = U.castSTUArray castDoubleToIntArray :: STUArray s Int Double -> ST s (STUArray s Int Int) -castDoubleToIntArray = castSTUArray +castDoubleToIntArray = U.castSTUArray -- floats are always 1 word floatToWord :: DynFlags -> Rational -> CmmLit diff --git a/compiler/nativeGen/PprBase.hs b/compiler/nativeGen/PprBase.hs index 275d329d2a..90a3b303f4 100644 --- a/compiler/nativeGen/PprBase.hs +++ b/compiler/nativeGen/PprBase.hs @@ -15,8 +15,8 @@ module PprBase ( where -import Data.Array.Unsafe( castSTUArray ) -import Data.Array.ST hiding( castSTUArray ) +import qualified Data.Array.Unsafe as U ( castSTUArray ) +import Data.Array.ST import Control.Monad.ST @@ -28,10 +28,10 @@ import Data.Word -- Converting floating-point literals to integrals for printing castFloatToWord8Array :: STUArray s Int Float -> ST s (STUArray s Int Word8) -castFloatToWord8Array = castSTUArray +castFloatToWord8Array = U.castSTUArray castDoubleToWord8Array :: STUArray s Int Double -> ST s (STUArray s Int Word8) -castDoubleToWord8Array = castSTUArray +castDoubleToWord8Array = U.castSTUArray -- floatToBytes and doubleToBytes convert to the host's byte -- order. Providing that we're not cross-compiling for a |