diff options
| author | Miao Wang <miaowang@google.com> | 2017-07-06 22:33:01 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-07-06 22:33:01 +0000 |
| commit | 2468c2ff45d4443b07440c4063f5f1cabe4da65a (patch) | |
| tree | 28a6fbea7c5a1e9a0f1a209f8d33e6d72f1df851 /Eigen/src/Core/Array.h | |
| parent | 457e53bce95b3700e984cffd2ef8cfba1789ec6d (diff) | |
| parent | 63687fa8cbebcbae3d0a48a6c5d63677ffa6160e (diff) | |
| download | eigen-2468c2ff45d4443b07440c4063f5f1cabe4da65a.tar.gz | |
Merge "Rebase Eigen to 3.3.4" am: c905f05b1b
am: 63687fa8cb
Change-Id: Id4ec05eaa5243187830cb5826b13b94ffcff64ba
Diffstat (limited to 'Eigen/src/Core/Array.h')
| -rw-r--r-- | Eigen/src/Core/Array.h | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/Eigen/src/Core/Array.h b/Eigen/src/Core/Array.h index 0d34269fd..e10020d4f 100644 --- a/Eigen/src/Core/Array.h +++ b/Eigen/src/Core/Array.h @@ -231,10 +231,16 @@ class Array : Base(other) { } + private: + struct PrivateType {}; + public: + /** \sa MatrixBase::operator=(const EigenBase<OtherDerived>&) */ template<typename OtherDerived> EIGEN_DEVICE_FUNC - EIGEN_STRONG_INLINE Array(const EigenBase<OtherDerived> &other) + EIGEN_STRONG_INLINE Array(const EigenBase<OtherDerived> &other, + typename internal::enable_if<internal::is_convertible<typename OtherDerived::Scalar,Scalar>::value, + PrivateType>::type = PrivateType()) : Base(other.derived()) { } |