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/plugins/CommonCwiseUnaryOps.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/plugins/CommonCwiseUnaryOps.h')
| -rw-r--r-- | Eigen/src/plugins/CommonCwiseUnaryOps.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Eigen/src/plugins/CommonCwiseUnaryOps.h b/Eigen/src/plugins/CommonCwiseUnaryOps.h index 775e77c81..f2da51efa 100644 --- a/Eigen/src/plugins/CommonCwiseUnaryOps.h +++ b/Eigen/src/plugins/CommonCwiseUnaryOps.h @@ -32,20 +32,20 @@ typedef CwiseUnaryOp<internal::scalar_multiple_op<Scalar>, Derived> ScalarMultip /** \internal Represents a quotient of an expression by a scalar*/ typedef CwiseUnaryOp<internal::scalar_quotient1_op<Scalar>, Derived> ScalarQuotient1ReturnType; /** \internal the return type of conjugate() */ -typedef typename internal::meta_if<NumTraits<Scalar>::IsComplex, +typedef typename internal::conditional<NumTraits<Scalar>::IsComplex, const CwiseUnaryOp<internal::scalar_conjugate_op<Scalar>, Derived>, const Derived& - >::ret ConjugateReturnType; + >::type ConjugateReturnType; /** \internal the return type of real() const */ -typedef typename internal::meta_if<NumTraits<Scalar>::IsComplex, +typedef typename internal::conditional<NumTraits<Scalar>::IsComplex, const CwiseUnaryOp<internal::scalar_real_op<Scalar>, Derived>, const Derived& - >::ret RealReturnType; + >::type RealReturnType; /** \internal the return type of real() */ -typedef typename internal::meta_if<NumTraits<Scalar>::IsComplex, +typedef typename internal::conditional<NumTraits<Scalar>::IsComplex, CwiseUnaryView<internal::scalar_real_ref_op<Scalar>, Derived>, Derived& - >::ret NonConstRealReturnType; + >::type NonConstRealReturnType; /** \internal the return type of imag() const */ typedef CwiseUnaryOp<internal::scalar_imag_op<Scalar>, Derived> ImagReturnType; /** \internal the return type of imag() */ |