Skip to content

Commit a66987f

Browse files
committed
Merge pull request #1644 from bstatcomp/fix_returned_expressions
fix returned expressions # Conflicts: # stan/math/prim/fun/log_softmax.hpp
1 parent 31151b2 commit a66987f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+414
-29
lines changed

stan/math/prim/fun/acos.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ inline auto acos(const T& x) {
4545
template <typename Derived,
4646
typename = require_eigen_vt<std::is_arithmetic, Derived>>
4747
inline auto acos(const Eigen::MatrixBase<Derived>& x) {
48-
return x.derived().array().acos().matrix();
48+
return x.derived().array().acos().matrix().eval();
4949
}
5050

5151
} // namespace math

stan/math/prim/fun/asin.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ inline auto asin(const T& x) {
4545
template <typename Derived,
4646
typename = require_eigen_vt<std::is_arithmetic, Derived>>
4747
inline auto asin(const Eigen::MatrixBase<Derived>& x) {
48-
return x.derived().array().asin().matrix();
48+
return x.derived().array().asin().matrix().eval();
4949
}
5050

5151
} // namespace math

stan/math/prim/fun/atan.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ inline typename apply_scalar_unary<atan_fun, T>::return_t atan(const T& x) {
4545
template <typename Derived,
4646
typename = require_eigen_vt<std::is_arithmetic, Derived>>
4747
inline auto atan(const Eigen::MatrixBase<Derived>& x) {
48-
return x.derived().array().atan().matrix();
48+
return x.derived().array().atan().matrix().eval();
4949
}
5050

5151
} // namespace math

stan/math/prim/fun/ceil.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ inline auto ceil(const T& x) {
4545
template <typename Derived,
4646
typename = require_eigen_vt<std::is_arithmetic, Derived>>
4747
inline auto ceil(const Eigen::MatrixBase<Derived>& x) {
48-
return x.derived().array().ceil().matrix();
48+
return x.derived().array().ceil().matrix().eval();
4949
}
5050

5151
} // namespace math

stan/math/prim/fun/cos.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ inline auto cos(const T& x) {
4545
template <typename Derived,
4646
typename = require_eigen_vt<std::is_arithmetic, Derived>>
4747
inline auto cos(const Eigen::MatrixBase<Derived>& x) {
48-
return x.derived().array().cos().matrix();
48+
return x.derived().array().cos().matrix().eval();
4949
}
5050

5151
} // namespace math

stan/math/prim/fun/cosh.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ inline typename apply_scalar_unary<cosh_fun, T>::return_t cosh(const T& x) {
4545
template <typename Derived,
4646
typename = require_eigen_vt<std::is_arithmetic, Derived>>
4747
inline auto cosh(const Eigen::MatrixBase<Derived>& x) {
48-
return x.derived().array().cosh().matrix();
48+
return x.derived().array().cosh().matrix().eval();
4949
}
5050

5151
} // namespace math

stan/math/prim/fun/exp.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ inline auto exp(const T& x) {
6060
template <typename Derived,
6161
typename = require_eigen_vt<std::is_arithmetic, Derived>>
6262
inline auto exp(const Eigen::MatrixBase<Derived>& x) {
63-
return x.derived().array().exp().matrix();
63+
return x.derived().array().exp().matrix().eval();
6464
}
6565

6666
} // namespace math

stan/math/prim/fun/fabs.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ inline typename apply_scalar_unary<fabs_fun, T>::return_t fabs(const T& x) {
4545
template <typename Derived,
4646
typename = require_eigen_vt<std::is_arithmetic, Derived>>
4747
inline auto fabs(const Eigen::MatrixBase<Derived>& x) {
48-
return x.derived().array().abs().matrix();
48+
return x.derived().array().abs().matrix().eval();
4949
}
5050

5151
/**
@@ -57,7 +57,7 @@ inline auto fabs(const Eigen::MatrixBase<Derived>& x) {
5757
template <typename Derived,
5858
typename = require_eigen_vt<std::is_arithmetic, Derived>>
5959
inline auto fabs(const Eigen::ArrayBase<Derived>& x) {
60-
return x.derived().abs();
60+
return x.derived().abs().eval();
6161
}
6262

6363
} // namespace math

stan/math/prim/fun/floor.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ inline auto floor(const T& x) {
4545
template <typename Derived,
4646
typename = require_eigen_vt<std::is_arithmetic, Derived>>
4747
inline auto floor(const Eigen::MatrixBase<Derived>& x) {
48-
return x.derived().array().floor().matrix();
48+
return x.derived().array().floor().matrix().eval();
4949
}
5050

5151
} // namespace math

stan/math/prim/fun/inv.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ inline auto inv(const T& x) {
4545
template <typename Derived,
4646
typename = require_eigen_vt<std::is_arithmetic, Derived>>
4747
inline auto inv(const Eigen::MatrixBase<Derived>& x) {
48-
return x.derived().array().inverse().matrix();
48+
return x.derived().array().inverse().matrix().eval();
4949
}
5050

5151
/**
@@ -57,7 +57,7 @@ inline auto inv(const Eigen::MatrixBase<Derived>& x) {
5757
template <typename Derived,
5858
typename = require_eigen_vt<std::is_arithmetic, Derived>>
5959
inline auto inv(const Eigen::ArrayBase<Derived>& x) {
60-
return x.derived().inverse();
60+
return x.derived().inverse().eval();
6161
}
6262

6363
} // namespace math

0 commit comments

Comments
 (0)