Hide some deprecated classes.

This commit is contained in:
Gael Guennebaud 2014-02-24 11:41:19 +01:00
parent c98881e130
commit 1e0c2f6ddb
4 changed files with 13 additions and 7 deletions

View File

@ -13,6 +13,7 @@
namespace Eigen { namespace Eigen {
#ifndef EIGEN_TEST_EVALUATORS
/** \class GeneralProduct /** \class GeneralProduct
* \ingroup Core_Module * \ingroup Core_Module
* *
@ -34,6 +35,8 @@ namespace Eigen {
*/ */
template<typename Lhs, typename Rhs, int ProductType = internal::product_type<Lhs,Rhs>::value> template<typename Lhs, typename Rhs, int ProductType = internal::product_type<Lhs,Rhs>::value>
class GeneralProduct; class GeneralProduct;
#endif // EIGEN_TEST_EVALUATORS
enum { enum {
Large = 2, Large = 2,
@ -154,6 +157,7 @@ template<> struct product_type_selector<Large,Large,Small> { enum
} // end namespace internal } // end namespace internal
#ifndef EIGEN_TEST_EVALUATORS
/** \class ProductReturnType /** \class ProductReturnType
* \ingroup Core_Module * \ingroup Core_Module
* *
@ -201,6 +205,7 @@ struct ProductReturnType<Lhs,Rhs,LazyCoeffBasedProductMode>
template<typename Lhs, typename Rhs> template<typename Lhs, typename Rhs>
struct LazyProductReturnType : public ProductReturnType<Lhs,Rhs,LazyCoeffBasedProductMode> struct LazyProductReturnType : public ProductReturnType<Lhs,Rhs,LazyCoeffBasedProductMode>
{}; {};
#endif
/*********************************************************************** /***********************************************************************
* Implementation of Inner Vector Vector Product * 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 // 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 // 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); // case, we could have a specialization for Block<MatrixType,1,1> with: operator=(Scalar x);
#ifndef EIGEN_TEST_EVALUATORS
namespace internal { namespace internal {
@ -242,7 +248,7 @@ class GeneralProduct<Lhs, Rhs, InnerProduct>
return Base::coeff(0,0); return Base::coeff(0,0);
} }
}; };
#endif // EIGEN_TEST_EVALUATORS
/*********************************************************************** /***********************************************************************
* Implementation of Outer Vector Vector Product * Implementation of Outer Vector Vector Product
***********************************************************************/ ***********************************************************************/

View File

@ -12,7 +12,7 @@
namespace Eigen { namespace Eigen {
// #ifndef EIGEN_TEST_EVALUATORS #ifndef EIGEN_TEST_EVALUATORS
/** \class SwapWrapper /** \class SwapWrapper
* \ingroup Core_Module * \ingroup Core_Module
@ -137,7 +137,7 @@ template<typename ExpressionType> class SwapWrapper
ExpressionType& m_expression; ExpressionType& m_expression;
}; };
// #endif #endif
#ifdef EIGEN_ENABLE_EVALUATORS #ifdef EIGEN_ENABLE_EVALUATORS

View File

@ -770,7 +770,7 @@ struct solve_retval<FullPivLU<_MatrixType>, Rhs>
#endif #endif
/***** Implementation of inverse() *****************************************************/ /***** Implementation of inverse() *****************************************************/
#ifdef EIGEN_TEST_EVALUATORS
template<typename DstXprType, typename MatrixType, typename Scalar> template<typename DstXprType, typename MatrixType, typename Scalar>
struct Assignment<DstXprType, Inverse<FullPivLU<MatrixType> >, internal::assign_op<Scalar>, Dense2Dense, 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())); dst = src.nestedExpression().solve(MatrixType::Identity(src.rows(), src.cols()));
} }
}; };
#endif
} // end namespace internal } // end namespace internal
/******* MatrixBase methods *****************************************************************/ /******* MatrixBase methods *****************************************************************/

View File

@ -505,7 +505,7 @@ struct solve_retval<PartialPivLU<_MatrixType>, Rhs>
#endif #endif
/***** Implementation of inverse() *****************************************************/ /***** Implementation of inverse() *****************************************************/
#ifdef EIGEN_TEST_EVALUATORS
template<typename DstXprType, typename MatrixType, typename Scalar> template<typename DstXprType, typename MatrixType, typename Scalar>
struct Assignment<DstXprType, Inverse<PartialPivLU<MatrixType> >, internal::assign_op<Scalar>, Dense2Dense, 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())); dst = src.nestedExpression().solve(MatrixType::Identity(src.rows(), src.cols()));
} }
}; };
#endif
} // end namespace internal } // end namespace internal
/******** MatrixBase methods *******/ /******** MatrixBase methods *******/