diff options
author | Gael Guennebaud <g.gael@free.fr> | 2014-02-24 11:41:19 +0100 |
---|---|---|
committer | Gael Guennebaud <g.gael@free.fr> | 2014-02-24 11:41:19 +0100 |
commit | 1e0c2f6ddb60c85440fceb3503769bbee80452c2 (patch) | |
tree | d1bdf46ca12abe1fef427c6f79ff08f83655d31b /Eigen | |
parent | c98881e1306c94c53ad3de77f9e9036d98dbcf2a (diff) |
Hide some deprecated classes.
Diffstat (limited to 'Eigen')
-rw-r--r-- | Eigen/src/Core/GeneralProduct.h | 8 | ||||
-rw-r--r-- | Eigen/src/Core/Swap.h | 4 | ||||
-rw-r--r-- | Eigen/src/LU/FullPivLU.h | 4 | ||||
-rw-r--r-- | Eigen/src/LU/PartialPivLU.h | 4 |
4 files changed, 13 insertions, 7 deletions
diff --git a/Eigen/src/Core/GeneralProduct.h b/Eigen/src/Core/GeneralProduct.h index 06aa05ee6..c37526b72 100644 --- a/Eigen/src/Core/GeneralProduct.h +++ b/Eigen/src/Core/GeneralProduct.h @@ -13,6 +13,7 @@ namespace Eigen { +#ifndef EIGEN_TEST_EVALUATORS /** \class GeneralProduct * \ingroup Core_Module * @@ -34,6 +35,8 @@ namespace Eigen { */ template<typename Lhs, typename Rhs, int ProductType = internal::product_type<Lhs,Rhs>::value> class GeneralProduct; +#endif // EIGEN_TEST_EVALUATORS + enum { Large = 2, @@ -154,6 +157,7 @@ template<> struct product_type_selector<Large,Large,Small> { enum } // end namespace internal +#ifndef EIGEN_TEST_EVALUATORS /** \class ProductReturnType * \ingroup Core_Module * @@ -201,6 +205,7 @@ struct ProductReturnType<Lhs,Rhs,LazyCoeffBasedProductMode> template<typename Lhs, typename Rhs> struct LazyProductReturnType : public ProductReturnType<Lhs,Rhs,LazyCoeffBasedProductMode> {}; +#endif /*********************************************************************** * Implementation of Inner Vector Vector Product @@ -212,6 +217,7 @@ struct LazyProductReturnType : public ProductReturnType<Lhs,Rhs,LazyCoeffBasedPr // Cons: this could be a problem if in a meta unrolled algorithm a matrix-matrix // product ends up to a row-vector times col-vector product... To tackle this use // case, we could have a specialization for Block<MatrixType,1,1> with: operator=(Scalar x); +#ifndef EIGEN_TEST_EVALUATORS namespace internal { @@ -242,7 +248,7 @@ class GeneralProduct<Lhs, Rhs, InnerProduct> return Base::coeff(0,0); } }; - +#endif // EIGEN_TEST_EVALUATORS /*********************************************************************** * Implementation of Outer Vector Vector Product ***********************************************************************/ diff --git a/Eigen/src/Core/Swap.h b/Eigen/src/Core/Swap.h index e7d525572..9a1c5f4f8 100644 --- a/Eigen/src/Core/Swap.h +++ b/Eigen/src/Core/Swap.h @@ -12,7 +12,7 @@ namespace Eigen { -// #ifndef EIGEN_TEST_EVALUATORS +#ifndef EIGEN_TEST_EVALUATORS /** \class SwapWrapper * \ingroup Core_Module @@ -137,7 +137,7 @@ template<typename ExpressionType> class SwapWrapper ExpressionType& m_expression; }; -// #endif +#endif #ifdef EIGEN_ENABLE_EVALUATORS diff --git a/Eigen/src/LU/FullPivLU.h b/Eigen/src/LU/FullPivLU.h index 86de91ccb..e0236fd9e 100644 --- a/Eigen/src/LU/FullPivLU.h +++ b/Eigen/src/LU/FullPivLU.h @@ -770,7 +770,7 @@ struct solve_retval<FullPivLU<_MatrixType>, Rhs> #endif /***** Implementation of inverse() *****************************************************/ - +#ifdef EIGEN_TEST_EVALUATORS template<typename DstXprType, typename MatrixType, typename Scalar> struct Assignment<DstXprType, Inverse<FullPivLU<MatrixType> >, internal::assign_op<Scalar>, Dense2Dense, Scalar> { @@ -781,7 +781,7 @@ struct Assignment<DstXprType, Inverse<FullPivLU<MatrixType> >, internal::assign_ dst = src.nestedExpression().solve(MatrixType::Identity(src.rows(), src.cols())); } }; - +#endif } // end namespace internal /******* MatrixBase methods *****************************************************************/ diff --git a/Eigen/src/LU/PartialPivLU.h b/Eigen/src/LU/PartialPivLU.h index ac53f7ab5..65312f7d1 100644 --- a/Eigen/src/LU/PartialPivLU.h +++ b/Eigen/src/LU/PartialPivLU.h @@ -505,7 +505,7 @@ struct solve_retval<PartialPivLU<_MatrixType>, Rhs> #endif /***** Implementation of inverse() *****************************************************/ - +#ifdef EIGEN_TEST_EVALUATORS template<typename DstXprType, typename MatrixType, typename Scalar> struct Assignment<DstXprType, Inverse<PartialPivLU<MatrixType> >, internal::assign_op<Scalar>, Dense2Dense, Scalar> { @@ -516,7 +516,7 @@ struct Assignment<DstXprType, Inverse<PartialPivLU<MatrixType> >, internal::assi dst = src.nestedExpression().solve(MatrixType::Identity(src.rows(), src.cols())); } }; - +#endif } // end namespace internal /******** MatrixBase methods *******/ |