Merge pull request #8 from andreasnoack/fbot/deps

Fix deprecations
JuliaLinearAlgebra · Mar 9, 2018 · 8e7d971 · 8e7d971
2 parents ba1689d + 6811ee5
commit 8e7d971
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/src/common.jl b/src/common.jl
@@ -1,4 +1,4 @@
-function hcat{T<:AbstractVecOrMat}(x::Vector{T})
+function hcat(x::Vector{T}) where T<:AbstractVecOrMat
     l    = length(x)
     if l == 0
         throw(ArgumentError("cannot flatten empty vector"))
@@ -13,9 +13,9 @@ function hcat{T<:AbstractVecOrMat}(x::Vector{T})
     end
 end
 
-A_mul_B!{T<:BlasFloat}(α::Number, A::StridedMatrix{T}, x::StridedVector{T}, β::Number, y::StridedVector{T}) = BLAS.gemv!('N', convert(T, α), A, x, convert(T, β), y)
-Ac_mul_B!{T<:BlasReal}(α::Number, A::StridedMatrix{T}, x::StridedVector{T}, β::Number, y::StridedVector{T}) = BLAS.gemv!('T', convert(T, α), A, x, convert(T, β), y)
-Ac_mul_B!{T<:BlasComplex}(α::Number, A::StridedMatrix{T}, x::StridedVector{T}, β::Number, y::StridedVector{T}) = BLAS.gemv!('C', convert(T, α), A, x, convert(T, β), y)
+A_mul_B!(α::Number, A::StridedMatrix{T}, x::StridedVector{T}, β::Number, y::StridedVector{T}) where {T<:BlasFloat} = BLAS.gemv!('N', convert(T, α), A, x, convert(T, β), y)
+Ac_mul_B!(α::Number, A::StridedMatrix{T}, x::StridedVector{T}, β::Number, y::StridedVector{T}) where {T<:BlasReal} = BLAS.gemv!('T', convert(T, α), A, x, convert(T, β), y)
+Ac_mul_B!(α::Number, A::StridedMatrix{T}, x::StridedVector{T}, β::Number, y::StridedVector{T}) where {T<:BlasComplex} = BLAS.gemv!('C', convert(T, α), A, x, convert(T, β), y)
 
 function A_mul_B!(α::Number, A::StridedMatrix, x::StridedVector, β::Number, y::StridedVector)
     n = length(y)

diff --git a/src/svd.jl b/src/svd.jl
@@ -300,7 +300,7 @@ tsvd(A,
 
 ### SVD by Lanczos on A'A
 
-type AtA{T,S<:AbstractMatrix,V<:AbstractVecOrMat} <: AbstractMatrix{T}
+mutable struct AtA{T,S<:AbstractMatrix,V<:AbstractVecOrMat} <: AbstractMatrix{T}
     matrix::S
     vector::V
 end
@@ -320,17 +320,17 @@ function size(A::AtA, i::Integer)
 end
 size(A::AtA) = (size(A, 1), size(A, 2))
 
-function A_mul_B!{T,S,V}(α::T, A::AtA{T,S,V}, x::AbstractVecOrMat{T}, β::T, y::AbstractVecOrMat{T})
+function A_mul_B!(α::T, A::AtA{T,S,V}, x::AbstractVecOrMat{T}, β::T, y::AbstractVecOrMat{T}) where {T,S,V}
     A_mul_B!(one(T), A.matrix, x, zero(T), A.vector)
     Ac_mul_B!(α, A.matrix, A.vector, β, y)
     return y
 end
 # Split Vector and Matrix to avoid ambiguity
-function (*){T}(A::AtA{T}, x::AbstractVector)
+function (*)(A::AtA{T}, x::AbstractVector) where T
     A_mul_B!(one(T), A.matrix, convert(typeof(A.vector), x), zero(T), A.vector)
     return Ac_mul_B!(one(T), A.matrix, A.vector, zero(T), similar(A.vector, size(x)))
 end
-function (*){T}(A::AtA{T}, x::AbstractMatrix)
+function (*)(A::AtA{T}, x::AbstractMatrix) where T
     A_mul_B!(one(T), A.matrix, convert(typeof(A.vector), x), zero(T), A.vector)
     return Ac_mul_B!(one(T), A.matrix, A.vector, zero(T), similar(A.vector, size(x)))
 end