diff options
| author |  Rasmus Larsen <rmlarsen@google.com> | 2019-11-04 20:18:38 +0000 |
|---|---|---|
| committer | Rasmus Larsen <rmlarsen@google.com> | 2019-11-04 20:18:38 +0000 |
| commit | 0c9745903ab30ba9d945153c038bc60f6ae83e13 (patch) | |
| tree | f560071bd9ccd395fa2968803df22325658083fb /unsupported/Eigen/CXX11 | |
| parent | 73ecb2c57d39b1e2a7d4f535c1687a4d71eabff0 (diff) | |
| parent | e7ed4bd388be80db9cc5689e623fbdd9e5cfdf7b (diff) | |
Merged in ezhulenev/eigen-01 (pull request PR-746)
Remove internal::smart_copy and replace with std::copy
Diffstat (limited to 'unsupported/Eigen/CXX11')
| -rw-r--r-- | unsupported/Eigen/CXX11/src/Tensor/TensorStorage.h | 2 | ||||
| -rw-r--r-- | unsupported/Eigen/CXX11/src/util/CXX11Meta.h | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorStorage.h b/unsupported/Eigen/CXX11/src/Tensor/TensorStorage.h index e6a666f78..1f0cd9638 100644 --- a/unsupported/Eigen/CXX11/src/Tensor/TensorStorage.h +++ b/unsupported/Eigen/CXX11/src/Tensor/TensorStorage.h @@ -96,7 +96,7 @@ class TensorStorage<T, DSizes<IndexType, NumIndices_>, Options_> : m_data(internal::conditional_aligned_new_auto<T,(Options_&DontAlign)==0>(internal::array_prod(other.m_dimensions))) , m_dimensions(other.m_dimensions) { - internal::smart_copy(other.m_data, other.m_data+internal::array_prod(other.m_dimensions), m_data); + std::copy(other.m_data, other.m_data+internal::array_prod(other.m_dimensions), m_data); } EIGEN_DEVICE_FUNC Self& operator=(const Self& other) { diff --git a/unsupported/Eigen/CXX11/src/util/CXX11Meta.h b/unsupported/Eigen/CXX11/src/util/CXX11Meta.h index 1c770a32e..014f5116a 100644 --- a/unsupported/Eigen/CXX11/src/util/CXX11Meta.h +++ b/unsupported/Eigen/CXX11/src/util/CXX11Meta.h @@ -67,13 +67,11 @@ class array : public std::array<T, N> { : Base{{v1, v2, v3, v4, v5, v6, v7, v8}} { EIGEN_STATIC_ASSERT(N == 8, YOU_MADE_A_PROGRAMMING_MISTAKE); } -#if EIGEN_HAS_VARIADIC_TEMPLATES EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE array(std::initializer_list<T> l) { eigen_assert(l.size() == N); - internal::smart_copy(l.begin(), l.end(), &this->front()); + std::copy(l.begin(), l.end(), &this->front()); } -#endif }; namespace internal { |