From 2e46b1bbfd7957918d9a9b772b2d9a907c2e25a9 Mon Sep 17 00:00:00 2001 From: Jeff Bezanson Date: Sun, 12 Oct 2014 12:57:42 -0400 Subject: [PATCH] remove unsupported use of chained type parameters --- base/linalg/cholesky.jl | 2 +- base/linalg/ldlt.jl | 2 +- base/linalg/lu.jl | 2 +- base/linalg/symmetric.jl | 4 ++-- base/linalg/triangular.jl | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/base/linalg/cholesky.jl b/base/linalg/cholesky.jl index 69e0b756c459b..8920c0a66a873 100644 --- a/base/linalg/cholesky.jl +++ b/base/linalg/cholesky.jl @@ -1,7 +1,7 @@ ########################## # Cholesky Factorization # ########################## -immutable Cholesky{T,S<:AbstractMatrix{T},UpLo} <: Factorization{T} +immutable Cholesky{T,S<:AbstractMatrix,UpLo} <: Factorization{T} UL::S end immutable CholeskyPivoted{T} <: Factorization{T} diff --git a/base/linalg/ldlt.jl b/base/linalg/ldlt.jl index 2d5016c82bd2f..624ba87363d18 100644 --- a/base/linalg/ldlt.jl +++ b/base/linalg/ldlt.jl @@ -1,4 +1,4 @@ -immutable LDLt{T,S<:AbstractMatrix{T}} <: Factorization{T} +immutable LDLt{T,S<:AbstractMatrix} <: Factorization{T} data::S end diff --git a/base/linalg/lu.jl b/base/linalg/lu.jl index 14755187f1c48..121e20882cad4 100644 --- a/base/linalg/lu.jl +++ b/base/linalg/lu.jl @@ -1,7 +1,7 @@ #################### # LU Factorization # #################### -immutable LU{T,S<:AbstractMatrix{T}} <: Factorization{T} +immutable LU{T,S<:AbstractMatrix} <: Factorization{T} factors::S ipiv::Vector{BlasInt} info::BlasInt diff --git a/base/linalg/symmetric.jl b/base/linalg/symmetric.jl index b562a0e3fba58..bfde6693d3405 100644 --- a/base/linalg/symmetric.jl +++ b/base/linalg/symmetric.jl @@ -1,10 +1,10 @@ #Symmetric and Hermitian matrices -immutable Symmetric{T,S<:AbstractMatrix{T}} <: AbstractMatrix{T} +immutable Symmetric{T,S<:AbstractMatrix} <: AbstractMatrix{T} data::S uplo::Char end Symmetric(A::AbstractMatrix, uplo::Symbol=:U) = (chksquare(A);Symmetric{eltype(A),typeof(A)}(A, char_uplo(uplo))) -immutable Hermitian{T,S<:AbstractMatrix{T}} <: AbstractMatrix{T} +immutable Hermitian{T,S<:AbstractMatrix} <: AbstractMatrix{T} data::S uplo::Char end diff --git a/base/linalg/triangular.jl b/base/linalg/triangular.jl index 1448449f63430..6920a524abc43 100644 --- a/base/linalg/triangular.jl +++ b/base/linalg/triangular.jl @@ -1,5 +1,5 @@ ## Triangular -immutable Triangular{T,S<:AbstractMatrix{T},UpLo,IsUnit} <: AbstractMatrix{T} +immutable Triangular{T,S<:AbstractMatrix,UpLo,IsUnit} <: AbstractMatrix{T} data::S end function Triangular{T}(A::AbstractMatrix{T}, uplo::Symbol, isunit::Bool=false)