From fc05f1dea53234a3a07d8582893dace14d63de90 Mon Sep 17 00:00:00 2001 From: Sacha Verweij Date: Mon, 9 Jan 2017 12:30:43 -0800 Subject: [PATCH] Fix simultaneous merge issue between #19724 and #19922. --- base/sparse/higherorderfns.jl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/base/sparse/higherorderfns.jl b/base/sparse/higherorderfns.jl index 83f215b339fc8..bb339d4b19dc4 100644 --- a/base/sparse/higherorderfns.jl +++ b/base/sparse/higherorderfns.jl @@ -5,7 +5,7 @@ module HigherOrderFns # This module provides higher order functions specialized for sparse arrays, # particularly map[!]/broadcast[!] for SparseVectors and SparseMatrixCSCs at present. import Base: map, map!, broadcast, broadcast! -import Base.Broadcast: containertype, promote_containertype, +import Base.Broadcast: _containertype, promote_containertype, broadcast_indices, broadcast_c, broadcast_c! using Base: front, tail, to_shape @@ -843,7 +843,7 @@ end # broadcast shape promotion for combinations of sparse arrays and other types broadcast_indices(::Type{AbstractSparseArray}, A) = indices(A) # broadcast container type promotion for combinations of sparse arrays and other types -containertype{T<:SparseVecOrMat}(::Type{T}) = AbstractSparseArray +_containertype{T<:SparseVecOrMat}(::Type{T}) = AbstractSparseArray # combinations of sparse arrays with broadcast scalars should yield sparse arrays promote_containertype(::Type{Any}, ::Type{AbstractSparseArray}) = AbstractSparseArray promote_containertype(::Type{AbstractSparseArray}, ::Type{Any}) = AbstractSparseArray