diff options
| author |  Hauke Heibel <hauke.heibel@gmail.com> | 2010-10-25 22:13:49 +0200 |
|---|---|---|
| committer | Hauke Heibel <hauke.heibel@gmail.com> | 2010-10-25 22:13:49 +0200 |
| commit | 7bc8e3ac0917cdc14015e00e8b29ac299b2b772a (patch) | |
| tree | 8c6af03e1d27e0e035bc4bd9be042f78384d10e1 /Eigen/src/Core/VectorwiseOp.h | |
| parent | 597b2745e1cfe1bf1cc4c4c189ecd16d2a0c1738 (diff) | |
Initial fixes for bug #85.
Renamed meta_{true|false} to {true|false}_type, meta_if to conditional, is_same_type to is_same, un{ref|pointer|const} to remove_{reference|pointer|const} and makeconst to add_const.
Changed boolean type 'ret' member to 'value'.
Changed 'ret' members refering to types to 'type'.
Adapted all code occurences.
Diffstat (limited to 'Eigen/src/Core/VectorwiseOp.h')
| -rw-r--r-- | Eigen/src/Core/VectorwiseOp.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Eigen/src/Core/VectorwiseOp.h b/Eigen/src/Core/VectorwiseOp.h index 4c794d5b5..8cd516479 100644 --- a/Eigen/src/Core/VectorwiseOp.h +++ b/Eigen/src/Core/VectorwiseOp.h @@ -182,8 +182,8 @@ template<typename ExpressionType, int Direction> class VectorwiseOp typedef typename ExpressionType::Scalar Scalar; typedef typename ExpressionType::RealScalar RealScalar; typedef typename ExpressionType::Index Index; - typedef typename internal::meta_if<internal::must_nest_by_value<ExpressionType>::ret, - ExpressionType, const ExpressionType&>::ret ExpressionTypeNested; + typedef typename internal::conditional<internal::must_nest_by_value<ExpressionType>::ret, + ExpressionType, const ExpressionType&>::type ExpressionTypeNested; template<template<typename _Scalar> class Functor, typename Scalar=typename internal::traits<ExpressionType>::Scalar> struct ReturnType @@ -211,9 +211,9 @@ template<typename ExpressionType, int Direction> class VectorwiseOp /** \internal * \returns the i-th subvector according to the \c Direction */ - typedef typename internal::meta_if<Direction==Vertical, + typedef typename internal::conditional<Direction==Vertical, typename ExpressionType::ColXpr, - typename ExpressionType::RowXpr>::ret SubVector; + typename ExpressionType::RowXpr>::type SubVector; SubVector subVector(Index i) { return SubVector(m_matrix.derived(),i); |