From 0ad54180c0bec0b5b8e1999bf5daa8345e8f447b Mon Sep 17 00:00:00 2001 From: Mason Protter Date: Fri, 24 Apr 2020 17:10:15 -0600 Subject: [PATCH 1/2] Update Scalar.jl --- src/Scalar.jl | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Scalar.jl b/src/Scalar.jl index dc85da61..e3d01fba 100644 --- a/src/Scalar.jl +++ b/src/Scalar.jl @@ -9,6 +9,7 @@ const Scalar{T} = SArray{Tuple{},T,0,1} @inline Scalar(x::Tuple{T}) where {T} = Scalar{T}(x[1]) @inline Scalar(a::AbstractArray) = Scalar{typeof(a)}((a,)) @inline Scalar(a::AbstractScalar) = Scalar{eltype(a)}((a[],)) # Do we want this to convert or wrap? +@inline Scalar(a::SA) where {SA<:StaticArrar} = Scalar{SA}(a) # solve ambiguity @inline function convert(::Type{SA}, a::AbstractArray) where {SA <: Scalar} return SA((a[],)) end From 97a3e0f2210a432747acdcf8a14fa62bd038d7b2 Mon Sep 17 00:00:00 2001 From: Mason Protter Date: Fri, 24 Apr 2020 17:17:49 -0600 Subject: [PATCH 2/2] typo --- src/Scalar.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Scalar.jl b/src/Scalar.jl index e3d01fba..8cd6197f 100644 --- a/src/Scalar.jl +++ b/src/Scalar.jl @@ -9,7 +9,7 @@ const Scalar{T} = SArray{Tuple{},T,0,1} @inline Scalar(x::Tuple{T}) where {T} = Scalar{T}(x[1]) @inline Scalar(a::AbstractArray) = Scalar{typeof(a)}((a,)) @inline Scalar(a::AbstractScalar) = Scalar{eltype(a)}((a[],)) # Do we want this to convert or wrap? -@inline Scalar(a::SA) where {SA<:StaticArrar} = Scalar{SA}(a) # solve ambiguity +@inline Scalar(a::SA) where {SA<:StaticArray} = Scalar{SA}(a) # solve ambiguity @inline function convert(::Type{SA}, a::AbstractArray) where {SA <: Scalar} return SA((a[],)) end