Merge pull request #8933 from toivoh/pointer_arithmetic

RFC: Avoid unwanted signed/unsigned conversion check in pointer + and -
JuliaLang · Nov 10, 2014 · a1411ca · a1411ca
2 parents a015cce + 8988f49
commit a1411ca
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/base/pointer.jl b/base/pointer.jl
@@ -62,8 +62,8 @@ eltype{T}(::Ptr{T}) = T
 ==(x::Ptr, y::Ptr) = uint(x) == uint(y)
 -(x::Ptr, y::Ptr) = uint(x) - uint(y)
 
-+(x::Ptr, y::Integer) = oftype(x, uint(uint(x) + y))
--(x::Ptr, y::Integer) = oftype(x, uint(uint(x) - y))
++(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)