diff options
| author |  Benoit Steiner <benoit.steiner.goog@gmail.com> | 2016-11-03 03:55:11 -0700 |
|---|---|---|
| committer | Benoit Steiner <benoit.steiner.goog@gmail.com> | 2016-11-03 03:55:11 -0700 |
| commit | c80587c92b019de2bd31572aea95e5e6144f4207 (patch) | |
| tree | db8f34b522ab216863ee276373a2cea335801a76 /unsupported/Eigen/CXX11/src/Tensor/TensorExpr.h | |
| parent | 38b6048e1443d36d74760176ebe048bd8cd59446 (diff) | |
| parent | 3f1d0cdc2270f13fbc72d6b7080012e22329aabd (diff) | |
Merged eigen/eigen into default
Diffstat (limited to 'unsupported/Eigen/CXX11/src/Tensor/TensorExpr.h')
| -rw-r--r-- | unsupported/Eigen/CXX11/src/Tensor/TensorExpr.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorExpr.h b/unsupported/Eigen/CXX11/src/Tensor/TensorExpr.h index 5f2e329f2..85dfc7a69 100644 --- a/unsupported/Eigen/CXX11/src/Tensor/TensorExpr.h +++ b/unsupported/Eigen/CXX11/src/Tensor/TensorExpr.h @@ -283,7 +283,7 @@ class TensorCwiseTernaryOp : public TensorBase<TensorCwiseTernaryOp<TernaryOp, A arg1Expression() const { return m_arg1_xpr; } EIGEN_DEVICE_FUNC - const typename internal::remove_all<typename Arg1XprType::Nested>::type& + const typename internal::remove_all<typename Arg2XprType::Nested>::type& arg2Expression() const { return m_arg2_xpr; } EIGEN_DEVICE_FUNC @@ -292,7 +292,7 @@ class TensorCwiseTernaryOp : public TensorBase<TensorCwiseTernaryOp<TernaryOp, A protected: typename Arg1XprType::Nested m_arg1_xpr; - typename Arg1XprType::Nested m_arg2_xpr; + typename Arg2XprType::Nested m_arg2_xpr; typename Arg3XprType::Nested m_arg3_xpr; const TernaryOp m_functor; }; |