Repository : ssh://g...@git.haskell.org/primitive
On branch : ghc-head
Link :
http://git.haskell.org/packages/primitive.git/commitdiff/110c5caca5176357f63c55ad4a47cd85952ced1a
>---------------------------------------------------------------
commit 110c5caca5176357f63c55ad4a47cd85952ced1a
Author: Roman Leshchinskiy <r...@cse.unsw.edu.au>
Date: Thu Jan 26 16:09:14 2012 -0700
Delete deprecated operations
>---------------------------------------------------------------
110c5caca5176357f63c55ad4a47cd85952ced1a
Data/Primitive/Addr.hs | 10 +---------
Data/Primitive/ByteArray.hs | 37 +------------------------------------
2 files changed, 2 insertions(+), 45 deletions(-)
diff --git a/Data/Primitive/Addr.hs b/Data/Primitive/Addr.hs
index a38cfd2..9a8a077 100644
--- a/Data/Primitive/Addr.hs
+++ b/Data/Primitive/Addr.hs
@@ -22,10 +22,7 @@ module Data.Primitive.Addr (
indexOffAddr, readOffAddr, writeOffAddr,
-- * Block operations
- copyAddr, moveAddr, setAddr,
-
- -- * Deprecated operations
- memcpyAddr
+ copyAddr, moveAddr, setAddr
) where
import Control.Monad.Primitive
@@ -103,8 +100,3 @@ setAddr :: (Prim a, PrimMonad m) => Addr -> Int -> a -> m ()
{-# INLINE setAddr #-}
setAddr (Addr addr#) (I# n#) x = primitive_ (setOffAddr# addr# 0# n# x)
-memcpyAddr :: PrimMonad m => Addr -> Addr -> Int -> m ()
-{-# INLINE memcpyAddr #-}
-{-# DEPRECATED memcpyAddr "Use copyAddr instead" #-}
-memcpyAddr = copyAddr
-
diff --git a/Data/Primitive/ByteArray.hs b/Data/Primitive/ByteArray.hs
index 3bce4e3..4c93788 100644
--- a/Data/Primitive/ByteArray.hs
+++ b/Data/Primitive/ByteArray.hs
@@ -31,10 +31,7 @@ module Data.Primitive.ByteArray (
-- * Information
sizeofByteArray, sizeofMutableByteArray, sameMutableByteArray,
- byteArrayContents, mutableByteArrayContents,
-
- -- * Deprecated operations
- memcpyByteArray, memcpyByteArray', memmoveByteArray, memsetByteArray,
+ byteArrayContents, mutableByteArrayContents
) where
import Control.Monad.Primitive
@@ -239,38 +236,6 @@ fillByteArray = setByteArray
-memcpyByteArray
- :: PrimMonad m => MutableByteArray (PrimState m) -> Int
- -> MutableByteArray (PrimState m) -> Int
- -> Int -> m ()
-{-# DEPRECATED memcpyByteArray "Use copyMutableByteArray instead" #-}
-{-# INLINE memcpyByteArray #-}
-memcpyByteArray = copyMutableByteArray
-
-memcpyByteArray'
- :: PrimMonad m => MutableByteArray (PrimState m) -> Int
- -> ByteArray -> Int
- -> Int -> m ()
-{-# DEPRECATED memcpyByteArray' "Use copyByteArray instead" #-}
-{-# INLINE memcpyByteArray' #-}
-memcpyByteArray' = copyByteArray
-
-memmoveByteArray
- :: PrimMonad m => MutableByteArray (PrimState m) -> Int
- -> MutableByteArray (PrimState m) -> Int
- -> Int -> m ()
-{-# DEPRECATED memmoveByteArray "Use moveByteArray instead" #-}
-{-# INLINE memmoveByteArray #-}
-memmoveByteArray = moveByteArray
-
-memsetByteArray
- :: PrimMonad m => MutableByteArray (PrimState m) -> Int -> Word8
- -> Int -> m ()
-{-# DEPRECATED memsetByteArray "Use fillByteArray instead (WARNING: order of
arguments is different)" #-}
-{-# INLINE memsetByteArray #-}
-memsetByteArray dst off x sz = fillByteArray dst off sz x
-
-
foreign import ccall unsafe "primitive-memops.h memcpy_off"
memcpy_mba :: MutableByteArray# s -> CInt
-> MutableByteArray# s -> CInt
_______________________________________________
ghc-commits mailing list
ghc-commits@haskell.org
http://www.haskell.org/mailman/listinfo/ghc-commits
