aboutsummaryrefslogtreecommitdiffhomepage
path: root/Eigen/src/plugins/MatrixCwiseUnaryOps.h
diff options
context:
space:
mode:
authorGravatar Christoph Hertzberg <chtz@informatik.uni-bremen.de>2014-09-23 18:55:42 +0200
committerGravatar Christoph Hertzberg <chtz@informatik.uni-bremen.de>2014-09-23 18:55:42 +0200
commit421feea3b2ca7d1b4c8af567c282519f293ce38f (patch)
tree66f4c3328217a898ca18a1d936b3987169b190a8 /Eigen/src/plugins/MatrixCwiseUnaryOps.h
parent7817bc19a40caa1d7d5d56e995cc887af58b42a2 (diff)
member_redux constructor is explicit too. Renamed some typedefs for more consistency.
Diffstat (limited to 'Eigen/src/plugins/MatrixCwiseUnaryOps.h')
-rw-r--r--Eigen/src/plugins/MatrixCwiseUnaryOps.h18
1 files changed, 9 insertions, 9 deletions
diff --git a/Eigen/src/plugins/MatrixCwiseUnaryOps.h b/Eigen/src/plugins/MatrixCwiseUnaryOps.h
index 045a2ebb2..c99ee94ec 100644
--- a/Eigen/src/plugins/MatrixCwiseUnaryOps.h
+++ b/Eigen/src/plugins/MatrixCwiseUnaryOps.h
@@ -10,9 +10,9 @@
// This file is a base class plugin containing matrix specifics coefficient wise functions.
-typedef CwiseUnaryOp<internal::scalar_abs_op<Scalar>, const Derived> AbsReturnType;
-typedef CwiseUnaryOp<internal::scalar_abs2_op<Scalar>, const Derived> Abs2ReturnType;
-typedef CwiseUnaryOp<internal::scalar_sqrt_op<Scalar>, const Derived> SqrtReturnType;
+typedef CwiseUnaryOp<internal::scalar_abs_op<Scalar>, const Derived> CwiseAbsReturnType;
+typedef CwiseUnaryOp<internal::scalar_abs2_op<Scalar>, const Derived> CwiseAbs2ReturnType;
+typedef CwiseUnaryOp<internal::scalar_sqrt_op<Scalar>, const Derived> CwiseSqrtReturnType;
typedef CwiseUnaryOp<internal::scalar_inverse_op<Scalar>, const Derived> CwiseInverseReturnType;
typedef CwiseUnaryOp<std::binder1st<std::equal_to<Scalar> >, const Derived> CwiseScalarEqualReturnType;
/** \returns an expression of the coefficient-wise absolute value of \c *this
@@ -23,8 +23,8 @@ typedef CwiseUnaryOp<std::binder1st<std::equal_to<Scalar> >, const Derived> Cwis
* \sa cwiseAbs2()
*/
EIGEN_DEVICE_FUNC
-EIGEN_STRONG_INLINE const AbsReturnType
-cwiseAbs() const { return AbsReturnType(derived()); }
+EIGEN_STRONG_INLINE const CwiseAbsReturnType
+cwiseAbs() const { return CwiseAbsReturnType(derived()); }
/** \returns an expression of the coefficient-wise squared absolute value of \c *this
*
@@ -34,8 +34,8 @@ cwiseAbs() const { return AbsReturnType(derived()); }
* \sa cwiseAbs()
*/
EIGEN_DEVICE_FUNC
-EIGEN_STRONG_INLINE const Abs2ReturnType
-cwiseAbs2() const { return Abs2ReturnType(derived()); }
+EIGEN_STRONG_INLINE const CwiseAbs2ReturnType
+cwiseAbs2() const { return CwiseAbs2ReturnType(derived()); }
/** \returns an expression of the coefficient-wise square root of *this.
*
@@ -45,8 +45,8 @@ cwiseAbs2() const { return Abs2ReturnType(derived()); }
* \sa cwisePow(), cwiseSquare()
*/
EIGEN_DEVICE_FUNC
-inline const SqrtReturnType
-cwiseSqrt() const { return SqrtReturnType(derived()); }
+inline const CwiseSqrtReturnType
+cwiseSqrt() const { return CwiseSqrtReturnType(derived()); }
/** \returns an expression of the coefficient-wise inverse of *this.
*