Fix type inference for \

jiahao · Jul 17, 2014 · d589b14 · d589b14
1 parent 17d4847
commit d589b14
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/base/linalg/factorization.jl b/base/linalg/factorization.jl
@@ -395,9 +395,9 @@ function A_ldiv_B!{T<:BlasFloat}(A::Union(QRCompactWY{T},QRPivoted{T}), B::Strid
  A_ldiv_B!(Triangular(C[1:rnk,1:rnk],:U),sub(Ac_mul_B!(A[:Q],sub(B, 1:mA, 1:nrhs)),1:rnk,1:nrhs))
  B[rnk+1:end,:] = zero(T)
  LAPACK.ormrz!('L', iseltype(B, Complex) ? 'C' : 'T', C, τ, sub(B,1:nA,1:nrhs))
- return isa(A,QRPivoted) ? B[invperm(A[:p]),:] : B[1:nA,:], rnk
+ return isa(A,QRPivoted) ? B[invperm(A[:p]::Vector{BlasInt}),:] : B[1:nA,:], rnk
 end
-A_ldiv_B!{T<:BlasFloat}(A::Union(QRCompactWY{T},QRPivoted{T}), B::StridedVector{T}) = A_ldiv_B!(A,reshape(B,length(B),1))[:]
+A_ldiv_B!{T<:BlasFloat}(A::Union(QRCompactWY{T},QRPivoted{T}), B::StridedVector{T}) = vec(A_ldiv_B!(A,reshape(B,length(B),1)))
 A_ldiv_B!{T<:BlasFloat}(A::Union(QRCompactWY{T},QRPivoted{T}), B::StridedVecOrMat{T}) = A_ldiv_B!(A, B, sqrt(eps(real(float(one(eltype(B)))))))[1]
 function A_ldiv_B!{T}(A::QR{T},B::StridedMatrix{T})
  m, n = size(A)