From b33491070029834b776634bbd4ce4c4e1a0939a1 Mon Sep 17 00:00:00 2001 From: Charles Schlosser Date: Wed, 28 Feb 2024 02:40:45 +0000 Subject: [PATCH] delete shadowed typedefs --- Eigen/src/Core/ArithmeticSequence.h | 2 +- Eigen/src/Core/util/IndexedViewHelper.h | 2 +- Eigen/src/QR/ColPivHouseholderQR.h | 4 ---- Eigen/src/QR/FullPivHouseholderQR.h | 4 ---- 4 files changed, 2 insertions(+), 10 deletions(-) diff --git a/Eigen/src/Core/ArithmeticSequence.h b/Eigen/src/Core/ArithmeticSequence.h index 055beabd5..ae3fac3d6 100644 --- a/Eigen/src/Core/ArithmeticSequence.h +++ b/Eigen/src/Core/ArithmeticSequence.h @@ -229,7 +229,7 @@ struct get_compile_time_incr > template constexpr Index get_runtime_incr(const ArithmeticSequence& x) EIGEN_NOEXCEPT { return static_cast(x.incrObject()); -}; +} } // end namespace internal diff --git a/Eigen/src/Core/util/IndexedViewHelper.h b/Eigen/src/Core/util/IndexedViewHelper.h index 00018a98d..9d1b34833 100644 --- a/Eigen/src/Core/util/IndexedViewHelper.h +++ b/Eigen/src/Core/util/IndexedViewHelper.h @@ -70,7 +70,7 @@ struct get_compile_time_incr { template constexpr Index get_runtime_incr(const T&) EIGEN_NOEXCEPT { return Index(1); -}; +} // Analogue of std::get<0>(x), but tailored for our needs. template diff --git a/Eigen/src/QR/ColPivHouseholderQR.h b/Eigen/src/QR/ColPivHouseholderQR.h index bd0849d58..092c29d61 100644 --- a/Eigen/src/QR/ColPivHouseholderQR.h +++ b/Eigen/src/QR/ColPivHouseholderQR.h @@ -438,7 +438,6 @@ class ColPivHouseholderQR : public SolverBase typename MatrixType::Scalar ColPivHouseholderQR::determinant() const { - using Scalar = typename MatrixType::Scalar; eigen_assert(m_isInitialized && "HouseholderQR is not initialized."); eigen_assert(m_qr.rows() == m_qr.cols() && "You can't take the determinant of a non-square matrix!"); Scalar detQ; @@ -449,7 +448,6 @@ typename MatrixType::Scalar ColPivHouseholderQR::d template typename MatrixType::RealScalar ColPivHouseholderQR::absDeterminant() const { using std::abs; - using RealScalar = typename MatrixType::RealScalar; eigen_assert(m_isInitialized && "ColPivHouseholderQR is not initialized."); eigen_assert(m_qr.rows() == m_qr.cols() && "You can't take the determinant of a non-square matrix!"); return isInjective() ? abs(m_qr.diagonal().prod()) : RealScalar(0); @@ -457,7 +455,6 @@ typename MatrixType::RealScalar ColPivHouseholderQR typename MatrixType::RealScalar ColPivHouseholderQR::logAbsDeterminant() const { - using RealScalar = typename MatrixType::RealScalar; eigen_assert(m_isInitialized && "ColPivHouseholderQR is not initialized."); eigen_assert(m_qr.rows() == m_qr.cols() && "You can't take the determinant of a non-square matrix!"); return isInjective() ? m_qr.diagonal().cwiseAbs().array().log().sum() : -NumTraits::infinity(); @@ -465,7 +462,6 @@ typename MatrixType::RealScalar ColPivHouseholderQR typename MatrixType::Scalar ColPivHouseholderQR::signDeterminant() const { - using Scalar = typename MatrixType::Scalar; eigen_assert(m_isInitialized && "ColPivHouseholderQR is not initialized."); eigen_assert(m_qr.rows() == m_qr.cols() && "You can't take the determinant of a non-square matrix!"); Scalar detQ; diff --git a/Eigen/src/QR/FullPivHouseholderQR.h b/Eigen/src/QR/FullPivHouseholderQR.h index 0cadf2317..cae9ae4da 100644 --- a/Eigen/src/QR/FullPivHouseholderQR.h +++ b/Eigen/src/QR/FullPivHouseholderQR.h @@ -435,7 +435,6 @@ class FullPivHouseholderQR : public SolverBase typename MatrixType::Scalar FullPivHouseholderQR::determinant() const { - using Scalar = typename MatrixType::Scalar; eigen_assert(m_isInitialized && "HouseholderQR is not initialized."); eigen_assert(m_qr.rows() == m_qr.cols() && "You can't take the determinant of a non-square matrix!"); Scalar detQ; @@ -445,7 +444,6 @@ typename MatrixType::Scalar FullPivHouseholderQR:: template typename MatrixType::RealScalar FullPivHouseholderQR::absDeterminant() const { - using RealScalar = typename MatrixType::RealScalar; using std::abs; eigen_assert(m_isInitialized && "FullPivHouseholderQR is not initialized."); eigen_assert(m_qr.rows() == m_qr.cols() && "You can't take the determinant of a non-square matrix!"); @@ -454,7 +452,6 @@ typename MatrixType::RealScalar FullPivHouseholderQR typename MatrixType::RealScalar FullPivHouseholderQR::logAbsDeterminant() const { - using RealScalar = typename MatrixType::RealScalar; eigen_assert(m_isInitialized && "FullPivHouseholderQR is not initialized."); eigen_assert(m_qr.rows() == m_qr.cols() && "You can't take the determinant of a non-square matrix!"); return isInjective() ? m_qr.diagonal().cwiseAbs().array().log().sum() : -NumTraits::infinity(); @@ -462,7 +459,6 @@ typename MatrixType::RealScalar FullPivHouseholderQR typename MatrixType::Scalar FullPivHouseholderQR::signDeterminant() const { - using Scalar = typename MatrixType::Scalar; eigen_assert(m_isInitialized && "FullPivHouseholderQR is not initialized."); eigen_assert(m_qr.rows() == m_qr.cols() && "You can't take the determinant of a non-square matrix!"); Scalar detQ;