Merge pull request #20971 from Sacha0/nixrowvecambigs

resolve ambiguity between * methods
JuliaLang · Mar 12, 2017 · 6051590 · 6051590
2 parents 5e8f62c + 294b253
commit 6051590
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/base/linalg/rowvector.jl b/base/linalg/rowvector.jl
@@ -165,6 +165,7 @@ end
 
 # inner product -> dot product specializations
 @inline *{T<:Real}(rowvec::RowVector{T}, vec::AbstractVector{T}) = dot(parent(rowvec), vec)
+@inline *{T<:Real}(rowvec::ConjRowVector{T}, vec::AbstractVector{T}) = dot(rowvec', vec)
 @inline *(rowvec::ConjRowVector, vec::AbstractVector) = dot(rowvec', vec)
 
 # Generic behavior

diff --git a/test/linalg/rowvector.jl b/test/linalg/rowvector.jl
@@ -249,3 +249,7 @@ end
         @test A'*x' == A'*y == B*x' == B*y == C'
     end
 end
+
+@testset "ambiguity between * methods with RowVectors and ConjRowVectors (#20971)" begin
+    @test RowVector(ConjArray(ones(4))) * ones(4) == 4
+end