Merge pull request #7308 from catawbasam/master

Performance: float(AbstractArray) and complex(AbstractArray)
JuliaLang · Jun 18, 2014 · 25eddd3 · 25eddd3
2 parents 654e533 + abf522e
commit 25eddd3
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/base/abstractarray.jl b/base/abstractarray.jl
@@ -315,8 +315,15 @@ end
 float{T<:FloatingPoint}(x::AbstractArray{T}) = x
 complex{T<:Complex}(x::AbstractArray{T}) = x
 
-float(A::AbstractArray)   = map_promote(x->convert(FloatingPoint,x), A)
-complex(A::AbstractArray) = map_promote(x->convert(Complex,x), A)
+function float(A::AbstractArray) 
+    cnv(x) = convert(FloatingPoint,x)
+    map_promote(cnv, A)
+end
+
+function complex(A::AbstractArray) 
+    cnv(x) = convert(Complex,x)
+    map_promote(cnv, A)
+end
 
 full(x::AbstractArray) = x