diff options
| author |  Gael Guennebaud <g.gael@free.fr> | 2015-06-22 10:52:08 +0200 |
|---|---|---|
| committer | Gael Guennebaud <g.gael@free.fr> | 2015-06-22 10:52:08 +0200 |
| commit | 0848ba0a6e62f408c581b6d782fbf7ab102d5318 (patch) | |
| tree | 852acaa9975a990e2bcab9fac704b50001ebf3bd /Eigen/src/Core/Random.h | |
| parent | b3b3dcad0548d3d0842c7089625a8eb84f2ab478 (diff) | |
Fix return nullary return types: it must be based on the PlainObject type instead of the expression type.
Diffstat (limited to 'Eigen/src/Core/Random.h')
| -rw-r--r-- | Eigen/src/Core/Random.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Eigen/src/Core/Random.h b/Eigen/src/Core/Random.h index cf2a82877..02038e9e3 100644 --- a/Eigen/src/Core/Random.h +++ b/Eigen/src/Core/Random.h @@ -53,7 +53,7 @@ struct functor_traits<scalar_random_op<Scalar> > * \sa DenseBase::setRandom(), DenseBase::Random(Index), DenseBase::Random() */ template<typename Derived> -inline const CwiseNullaryOp<internal::scalar_random_op<typename internal::traits<Derived>::Scalar>, Derived> +inline const typename DenseBase<Derived>::RandomReturnType DenseBase<Derived>::Random(Index rows, Index cols) { return NullaryExpr(rows, cols, internal::scalar_random_op<Scalar>()); @@ -84,7 +84,7 @@ DenseBase<Derived>::Random(Index rows, Index cols) * \sa DenseBase::setRandom(), DenseBase::Random(Index,Index), DenseBase::Random() */ template<typename Derived> -inline const CwiseNullaryOp<internal::scalar_random_op<typename internal::traits<Derived>::Scalar>, Derived> +inline const typename DenseBase<Derived>::RandomReturnType DenseBase<Derived>::Random(Index size) { return NullaryExpr(size, internal::scalar_random_op<Scalar>()); @@ -110,7 +110,7 @@ DenseBase<Derived>::Random(Index size) * \sa DenseBase::setRandom(), DenseBase::Random(Index,Index), DenseBase::Random(Index) */ template<typename Derived> -inline const CwiseNullaryOp<internal::scalar_random_op<typename internal::traits<Derived>::Scalar>, Derived> +inline const typename DenseBase<Derived>::RandomReturnType DenseBase<Derived>::Random() { return NullaryExpr(RowsAtCompileTime, ColsAtCompileTime, internal::scalar_random_op<Scalar>()); |