mirror of
https://gitlab.com/libeigen/eigen.git
synced 2026-04-10 11:34:33 +08:00
Fix private shadowing of protected base members in iterative solvers
libeigen/eigen!2357 Closes #1859
This commit is contained in:
committed by
Rasmus Munk Larsen
parent
9fe2f03fa4
commit
753a6ac5b3
@@ -168,6 +168,7 @@ struct traits<BiCGSTAB<MatrixType_, Preconditioner_> > {
|
||||
*/
|
||||
template <typename MatrixType_, typename Preconditioner_>
|
||||
class BiCGSTAB : public IterativeSolverBase<BiCGSTAB<MatrixType_, Preconditioner_> > {
|
||||
protected:
|
||||
typedef IterativeSolverBase<BiCGSTAB> Base;
|
||||
using Base::m_error;
|
||||
using Base::m_info;
|
||||
|
||||
@@ -150,6 +150,7 @@ struct traits<ConjugateGradient<MatrixType_, UpLo_, Preconditioner_> > {
|
||||
*/
|
||||
template <typename MatrixType_, int UpLo_, typename Preconditioner_>
|
||||
class ConjugateGradient : public IterativeSolverBase<ConjugateGradient<MatrixType_, UpLo_, Preconditioner_> > {
|
||||
protected:
|
||||
typedef IterativeSolverBase<ConjugateGradient> Base;
|
||||
using Base::m_error;
|
||||
using Base::m_info;
|
||||
|
||||
@@ -145,6 +145,7 @@ struct traits<LeastSquaresConjugateGradient<MatrixType_, Preconditioner_> > {
|
||||
template <typename MatrixType_, typename Preconditioner_>
|
||||
class LeastSquaresConjugateGradient
|
||||
: public IterativeSolverBase<LeastSquaresConjugateGradient<MatrixType_, Preconditioner_> > {
|
||||
protected:
|
||||
typedef IterativeSolverBase<LeastSquaresConjugateGradient> Base;
|
||||
using Base::m_error;
|
||||
using Base::m_info;
|
||||
|
||||
@@ -280,6 +280,7 @@ struct traits<Eigen::BiCGSTABL<MatrixType_, Preconditioner_>> {
|
||||
|
||||
template <typename MatrixType_, typename Preconditioner_>
|
||||
class BiCGSTABL : public IterativeSolverBase<BiCGSTABL<MatrixType_, Preconditioner_>> {
|
||||
protected:
|
||||
typedef IterativeSolverBase<BiCGSTABL> Base;
|
||||
using Base::m_error;
|
||||
using Base::m_info;
|
||||
|
||||
@@ -96,6 +96,7 @@ void sortWithPermutation(VectorType& vec, IndexType& perm, typename IndexType::S
|
||||
*/
|
||||
template <typename MatrixType_, typename Preconditioner_>
|
||||
class DGMRES : public IterativeSolverBase<DGMRES<MatrixType_, Preconditioner_> > {
|
||||
protected:
|
||||
typedef IterativeSolverBase<DGMRES> Base;
|
||||
using Base::m_error;
|
||||
using Base::m_info;
|
||||
|
||||
@@ -253,6 +253,7 @@ struct traits<GMRES<MatrixType_, Preconditioner_> > {
|
||||
*/
|
||||
template <typename MatrixType_, typename Preconditioner_>
|
||||
class GMRES : public IterativeSolverBase<GMRES<MatrixType_, Preconditioner_> > {
|
||||
protected:
|
||||
typedef IterativeSolverBase<GMRES> Base;
|
||||
using Base::m_error;
|
||||
using Base::m_info;
|
||||
|
||||
@@ -410,6 +410,7 @@ struct traits<IDRSTABL<MatrixType_, Preconditioner_>> {
|
||||
|
||||
template <typename MatrixType_, typename Preconditioner_>
|
||||
class IDRSTABL : public IterativeSolverBase<IDRSTABL<MatrixType_, Preconditioner_>> {
|
||||
protected:
|
||||
typedef IterativeSolverBase<IDRSTABL> Base;
|
||||
using Base::m_error;
|
||||
using Base::m_info;
|
||||
|
||||
@@ -186,6 +186,7 @@ struct traits<MINRES<MatrixType_, UpLo_, Preconditioner_> > {
|
||||
*/
|
||||
template <typename MatrixType_, int UpLo_, typename Preconditioner_>
|
||||
class MINRES : public IterativeSolverBase<MINRES<MatrixType_, UpLo_, Preconditioner_> > {
|
||||
protected:
|
||||
typedef IterativeSolverBase<MINRES> Base;
|
||||
using Base::m_error;
|
||||
using Base::m_info;
|
||||
|
||||
Reference in New Issue
Block a user