diff options
| author |  Benoit Jacob <jacob.benoit.1@gmail.com> | 2011-01-24 08:27:06 -0500 |
|---|---|---|
| committer | Benoit Jacob <jacob.benoit.1@gmail.com> | 2011-01-24 08:27:06 -0500 |
| commit | c3a4f6b5c58117ec24fca376fd3cb91302aef0c2 (patch) | |
| tree | 6f053a17614e82b701f356b7b6c1a13eadeaccae /Eigen/src/plugins/ArrayCwiseBinaryOps.h | |
| parent | 5331fa3033fb615f6123d552ad6fa4a782b7d72f (diff) | |
const-qualify template parameters representing const arguments to expressions.
needed to fix docs compile issue.
Diffstat (limited to 'Eigen/src/plugins/ArrayCwiseBinaryOps.h')
| -rw-r--r-- | Eigen/src/plugins/ArrayCwiseBinaryOps.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Eigen/src/plugins/ArrayCwiseBinaryOps.h b/Eigen/src/plugins/ArrayCwiseBinaryOps.h index d19299c35..3928b6bc9 100644 --- a/Eigen/src/plugins/ArrayCwiseBinaryOps.h +++ b/Eigen/src/plugins/ArrayCwiseBinaryOps.h @@ -14,10 +14,10 @@ operator*(const EIGEN_CURRENT_STORAGE_BASE_CLASS<OtherDerived> &other) const * \sa MatrixBase::cwiseQuotient */ template<typename OtherDerived> -EIGEN_STRONG_INLINE const CwiseBinaryOp<internal::scalar_quotient_op<Scalar>, Derived, OtherDerived> +EIGEN_STRONG_INLINE const CwiseBinaryOp<internal::scalar_quotient_op<Scalar>, const Derived, const OtherDerived> operator/(const EIGEN_CURRENT_STORAGE_BASE_CLASS<OtherDerived> &other) const { - return CwiseBinaryOp<internal::scalar_quotient_op<Scalar>, Derived, OtherDerived>(derived(), other.derived()); + return CwiseBinaryOp<internal::scalar_quotient_op<Scalar>, const Derived, const OtherDerived>(derived(), other.derived()); } /** \returns an expression of the coefficient-wise min of \c *this and \a other @@ -111,13 +111,13 @@ EIGEN_MAKE_CWISE_BINARY_OP(operator!=,std::not_equal_to) * * \sa operator+=(), operator-() */ -inline const CwiseUnaryOp<internal::scalar_add_op<Scalar>, Derived> +inline const CwiseUnaryOp<internal::scalar_add_op<Scalar>, const Derived> operator+(const Scalar& scalar) const { - return CwiseUnaryOp<internal::scalar_add_op<Scalar>, Derived>(derived(), internal::scalar_add_op<Scalar>(scalar)); + return CwiseUnaryOp<internal::scalar_add_op<Scalar>, const Derived>(derived(), internal::scalar_add_op<Scalar>(scalar)); } -friend inline const CwiseUnaryOp<internal::scalar_add_op<Scalar>, Derived> +friend inline const CwiseUnaryOp<internal::scalar_add_op<Scalar>, const Derived> operator+(const Scalar& scalar,const EIGEN_CURRENT_STORAGE_BASE_CLASS<Derived>& other) { return other + scalar; @@ -130,13 +130,13 @@ operator+(const Scalar& scalar,const EIGEN_CURRENT_STORAGE_BASE_CLASS<Derived>& * * \sa operator+(), operator-=() */ -inline const CwiseUnaryOp<internal::scalar_add_op<Scalar>, Derived> +inline const CwiseUnaryOp<internal::scalar_add_op<Scalar>, const Derived> operator-(const Scalar& scalar) const { return *this + (-scalar); } -friend inline const CwiseUnaryOp<internal::scalar_add_op<Scalar>, CwiseUnaryOp<internal::scalar_opposite_op<Scalar>,Derived> > +friend inline const CwiseUnaryOp<internal::scalar_add_op<Scalar>, CwiseUnaryOp<internal::scalar_opposite_op<Scalar>, const Derived> > operator-(const Scalar& scalar,const EIGEN_CURRENT_STORAGE_BASE_CLASS<Derived>& other) { return (-other) + scalar; |