diff options
Diffstat (limited to 'Eigen/src/misc/Solve.h')
| -rw-r--r-- | Eigen/src/misc/Solve.h | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/Eigen/src/misc/Solve.h b/Eigen/src/misc/Solve.h index d6fc67406..bce2b2624 100644 --- a/Eigen/src/misc/Solve.h +++ b/Eigen/src/misc/Solve.h @@ -25,11 +25,13 @@ #ifndef EIGEN_MISC_SOLVE_H #define EIGEN_MISC_SOLVE_H -/** \class ei_solve_retval_base +namespace internal { + +/** \class solve_retval_base * */ template<typename DecompositionType, typename Rhs> -struct ei_traits<ei_solve_retval_base<DecompositionType, Rhs> > +struct traits<solve_retval_base<DecompositionType, Rhs> > { typedef typename DecompositionType::MatrixType MatrixType; typedef Matrix<typename Rhs::Scalar, @@ -40,15 +42,15 @@ struct ei_traits<ei_solve_retval_base<DecompositionType, Rhs> > Rhs::MaxColsAtCompileTime> ReturnType; }; -template<typename _DecompositionType, typename Rhs> struct ei_solve_retval_base - : public ReturnByValue<ei_solve_retval_base<_DecompositionType, Rhs> > +template<typename _DecompositionType, typename Rhs> struct solve_retval_base + : public ReturnByValue<solve_retval_base<_DecompositionType, Rhs> > { - typedef typename ei_cleantype<typename Rhs::Nested>::type RhsNestedCleaned; + typedef typename cleantype<typename Rhs::Nested>::type RhsNestedCleaned; typedef _DecompositionType DecompositionType; - typedef ReturnByValue<ei_solve_retval_base> Base; + typedef ReturnByValue<solve_retval_base> Base; typedef typename Base::Index Index; - ei_solve_retval_base(const DecompositionType& dec, const Rhs& rhs) + solve_retval_base(const DecompositionType& dec, const Rhs& rhs) : m_dec(dec), m_rhs(rhs) {} @@ -59,7 +61,7 @@ template<typename _DecompositionType, typename Rhs> struct ei_solve_retval_base template<typename Dest> inline void evalTo(Dest& dst) const { - static_cast<const ei_solve_retval<DecompositionType,Rhs>*>(this)->evalTo(dst); + static_cast<const solve_retval<DecompositionType,Rhs>*>(this)->evalTo(dst); } protected: @@ -67,17 +69,19 @@ template<typename _DecompositionType, typename Rhs> struct ei_solve_retval_base const typename Rhs::Nested m_rhs; }; +} // end namespace internal + #define EIGEN_MAKE_SOLVE_HELPERS(DecompositionType,Rhs) \ typedef typename DecompositionType::MatrixType MatrixType; \ typedef typename MatrixType::Scalar Scalar; \ typedef typename MatrixType::RealScalar RealScalar; \ typedef typename MatrixType::Index Index; \ - typedef ei_solve_retval_base<DecompositionType,Rhs> Base; \ + typedef Eigen::internal::solve_retval_base<DecompositionType,Rhs> Base; \ using Base::dec; \ using Base::rhs; \ using Base::rows; \ using Base::cols; \ - ei_solve_retval(const DecompositionType& dec, const Rhs& rhs) \ + solve_retval(const DecompositionType& dec, const Rhs& rhs) \ : Base(dec, rhs) {} #endif // EIGEN_MISC_SOLVE_H |