From 47064dabc34f572fb8716d0a36a4a2e1122a9031 Mon Sep 17 00:00:00 2001 From: Tim Holy Date: Sat, 22 Jul 2017 06:59:39 -0500 Subject: [PATCH] Remove atsign-functorize --- src/ColorVectorSpace.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ColorVectorSpace.jl b/src/ColorVectorSpace.jl index 31bb436..17f86bc 100644 --- a/src/ColorVectorSpace.jl +++ b/src/ColorVectorSpace.jl @@ -51,7 +51,7 @@ _nan{T<:AbstractFloat,C<:AbstractRGB}(::Type{T}, ::Type{C}) = (x = convert(T, Na _nan{T<:AbstractFloat,C<:TransparentRGB}(::Type{T}, ::Type{C}) = (x = convert(T, NaN); C(x,x,x,x)) ## Generic algorithms -mapreduce(f, op::Union{typeof(@functorize(&)), typeof(@functorize(|))}, a::MathTypes) = f(a) # ambiguity +mapreduce(f, op::Union{typeof(&), typeof(|)}, a::MathTypes) = f(a) # ambiguity mapreduce(f, op, a::MathTypes) = f(a) Base.r_promote(::typeof(+), c::MathTypes) = mapc(x->Base.r_promote(+, x), c)