fix SqSMatrix ambiguity that impacted a KVec constructor

thchr · Apr 21, 2021 · 3765bfd · 3765bfd · thchr · Apr 21, 2021
1 parent f3e04a0
commit 3765bfd
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/Project.toml b/Project.toml
@@ -1,7 +1,7 @@
 name = "Crystalline"
 uuid = "ae5e2be0-a263-11e9-351e-f94dad1eb351"
 authors = ["Thomas Christensen <[email protected]>"]
-version = "0.3.4"
+version = "0.3.5"
 
 [deps]
 Combinatorics = "861a8166-3701-5b0c-9a16-15d98fcdc6aa"

diff --git a/src/SquareStaticMatrices.jl b/src/SquareStaticMatrices.jl
@@ -72,6 +72,7 @@ end
     D = checksquare(A)
     @inbounds SqSMatrix{D}(A::AbstractMatrix{T})
 end
+SqSMatrix{D,T}(A::SqSMatrix{D,T}) where {D,T} = A # resolve an ambiguity (StaticMatrix vs. AbstractMatrix)
 
 function flatten_nested(cols::NTuple{D, NTuple{D, T}}) where {D,T}
     ntuple(Val{D*D}()) do idx

diff --git a/test/kvecs.jl b/test/kvecs.jl
@@ -22,6 +22,8 @@ using Test, Crystalline, StaticArrays, LinearAlgebra
         @test KVec{3}("u,v,0.5")([.7,.2,.3]) == [.7,.2,.5]
         @test KVec{3}("v,u,0.5")([.7,.2,.3]) == [.2,.7,.5]
 
+        @test KVec([0.0,1//1,2]) == KVec{3}("0,1,2")
+
         @test zero(KVec{3}) == KVec{3}("0,0,0") == zero(KVec{3}("1,2,3"))
     end