diff options
| author |  Gael Guennebaud <g.gael@free.fr> | 2016-06-14 12:07:00 +0200 |
|---|---|---|
| committer | Gael Guennebaud <g.gael@free.fr> | 2016-06-14 12:07:00 +0200 |
| commit | a9bb653a684b55fca1c9f58089f94871484ae50c (patch) | |
| tree | 87949d506aa85c63d0424619725ca643b9f25e0b /doc | |
| parent | a8c08e8b8e8bdd486a5a27b9f1e92c48ef4361cd (diff) | |
Update doc (scalar_add_op is now deprecated)
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/CustomizingEigen.dox | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/doc/CustomizingEigen.dox b/doc/CustomizingEigen.dox index cb25f4ec9..607f86658 100644 --- a/doc/CustomizingEigen.dox +++ b/doc/CustomizingEigen.dox @@ -56,13 +56,13 @@ void makeFloor(const MatrixBase<OtherDerived>& other) { derived() = derived().cw template<typename OtherDerived> void makeCeil(const MatrixBase<OtherDerived>& other) { derived() = derived().cwiseMax(other.derived()); } -const CwiseUnaryOp<internal::scalar_add_op<Scalar>, Derived> +const CwiseBinaryOp<internal::scalar_sum_op<Scalar>, const Derived, const ConstantReturnType> operator+(const Scalar& scalar) const -{ return CwiseUnaryOp<internal::scalar_add_op<Scalar>, Derived>(derived(), internal::scalar_add_op<Scalar>(scalar)); } +{ return CwiseBinaryOp<internal::scalar_sum_op<Scalar>, const Derived, const ConstantReturnType>(derived(), Constant(rows(),cols(),scalar)); } -friend const CwiseUnaryOp<internal::scalar_add_op<Scalar>, Derived> +friend const CwiseBinaryOp<internal::scalar_sum_op<Scalar>, const ConstantReturnType, Derived> operator+(const Scalar& scalar, const MatrixBase<Derived>& mat) -{ return CwiseUnaryOp<internal::scalar_add_op<Scalar>, Derived>(mat.derived(), internal::scalar_add_op<Scalar>(scalar)); } +{ return CwiseBinaryOp<internal::scalar_sum_op<Scalar>, const ConstantReturnType, Derived>(Constant(rows(),cols(),scalar), mat.derived()); } \endcode Then one can the following declaration in the config.h or whatever prerequisites header file of his project: |