Deprecate zero and one for Ptr{T}

They doesn't fulfill the documentation for zero and one about additive and multiplicative identity. See discussion in JuliaLang#6183 (comment)
waTeim · Nov 23, 2014 · c80ce83 · c80ce83
1 parent 0cf295e
commit c80ce83
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 12 deletions.
diff --git a/base/deprecated.jl b/base/deprecated.jl
@@ -216,10 +216,7 @@ end
 export String
 const String = AbstractString
 
-export Uint, Uint8, Uint16, Uint32, Uint64, Uint128
-const Uint = UInt
-const Uint8 = UInt8
-const Uint16 = UInt16
-const Uint32 = UInt32
-const Uint64 = UInt64
-const Uint128 = UInt128
+@deprecate zero{T}(::Type{Ptr{T}}) Ptr{T}(0)
+@deprecate zero{T}(x::Ptr{T})      Ptr{T}(0)
+@deprecate one{T}(::Type{Ptr{T}})  Ptr{T}(1)
+@deprecate one{T}(x::Ptr{T})       Ptr{T}(1)
diff --git a/base/pointer.jl b/base/pointer.jl
@@ -65,8 +65,3 @@ eltype{T}(::Ptr{T}) = T
 +(x::Ptr, y::Integer) = oftype(x, (uint(x) + (y % UInt) % UInt))
 -(x::Ptr, y::Integer) = oftype(x, (uint(x) - (y % UInt) % UInt))
 +(x::Integer, y::Ptr) = y + x
-
-zero{T}(::Type{Ptr{T}}) = convert(Ptr{T}, 0)
-zero{T}(x::Ptr{T}) = convert(Ptr{T}, 0)
-one{T}(::Type{Ptr{T}}) = convert(Ptr{T}, 1)
-one{T}(x::Ptr{T}) = convert(Ptr{T}, 1)