diff options
author | 2021-03-05 13:16:43 +0100 | |
---|---|---|
committer | 2021-03-05 13:16:43 +0100 | |
commit | 5f0b4a4010af4cbf6161a0d1a03a747addc44a5d (patch) | |
tree | 23356aec10fb951fb51adf970a810e7ae18cf940 /Eigen/src/IterativeLinearSolvers/SolveWithGuess.h | |
parent | 6cbb3038ac48cb5fe17eba4dfbf26e3e798041f1 (diff) |
Revert "Adds EIGEN_CONSTEXPR and EIGEN_NOEXCEPT to rows(), cols(), innerStride(), outerStride(), and size()"
This reverts commit 6cbb3038ac48cb5fe17eba4dfbf26e3e798041f1 because it
breaks clang-10 builds on x86 and aarch64 when C++11 is enabled.
Diffstat (limited to 'Eigen/src/IterativeLinearSolvers/SolveWithGuess.h')
-rw-r--r-- | Eigen/src/IterativeLinearSolvers/SolveWithGuess.h | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/Eigen/src/IterativeLinearSolvers/SolveWithGuess.h b/Eigen/src/IterativeLinearSolvers/SolveWithGuess.h index 7b8965754..79e1e4819 100644 --- a/Eigen/src/IterativeLinearSolvers/SolveWithGuess.h +++ b/Eigen/src/IterativeLinearSolvers/SolveWithGuess.h @@ -13,7 +13,7 @@ namespace Eigen { template<typename Decomposition, typename RhsType, typename GuessType> class SolveWithGuess; - + /** \class SolveWithGuess * \ingroup IterativeLinearSolvers_Module * @@ -45,15 +45,13 @@ public: typedef typename internal::traits<SolveWithGuess>::PlainObject PlainObject; typedef typename internal::generic_xpr_base<SolveWithGuess<Decomposition,RhsType,GuessType>, MatrixXpr, typename internal::traits<RhsType>::StorageKind>::type Base; typedef typename internal::ref_selector<SolveWithGuess>::type Nested; - + SolveWithGuess(const Decomposition &dec, const RhsType &rhs, const GuessType &guess) : m_dec(dec), m_rhs(rhs), m_guess(guess) {} - - EIGEN_DEVICE_FUNC EIGEN_CONSTEXPR - Index rows() const EIGEN_NOEXCEPT { return m_dec.cols(); } - EIGEN_DEVICE_FUNC EIGEN_CONSTEXPR - Index cols() const EIGEN_NOEXCEPT { return m_rhs.cols(); } + + EIGEN_DEVICE_FUNC Index rows() const { return m_dec.cols(); } + EIGEN_DEVICE_FUNC Index cols() const { return m_rhs.cols(); } EIGEN_DEVICE_FUNC const Decomposition& dec() const { return m_dec; } EIGEN_DEVICE_FUNC const RhsType& rhs() const { return m_rhs; } @@ -63,7 +61,7 @@ protected: const Decomposition &m_dec; const RhsType &m_rhs; const GuessType &m_guess; - + private: Scalar coeff(Index row, Index col) const; Scalar coeff(Index i) const; @@ -87,8 +85,8 @@ struct evaluator<SolveWithGuess<Decomposition,RhsType, GuessType> > m_result = solve.guess(); solve.dec()._solve_with_guess_impl(solve.rhs(), m_result); } - -protected: + +protected: PlainObject m_result; }; |