diff options
| author |  Christoph Hertzberg <chtz@informatik.uni-bremen.de> | 2021-02-27 16:34:42 +0100 |
|---|---|---|
| committer | Christoph Hertzberg <chtz@informatik.uni-bremen.de> | 2021-02-27 18:44:26 +0100 |
| commit | ca528593f4c64a8464df9ac297c42561b14100be (patch) | |
| tree | def8b2b26650a4c6c8e75234eb33c7432390a218 /Eigen | |
| parent | 81b5fe2f0a86078189d1b4f66810d158ece0ea0e (diff) | |
Fixed/masked more implicit copy constructor warnings
(cherry picked from commit 2883e91ce5a99c391fbf28e20160176b70854992)
Diffstat (limited to 'Eigen')
| -rw-r--r-- | Eigen/src/Core/util/XprHelper.h | 2 | ||||
| -rw-r--r-- | Eigen/src/SparseCore/SparseSelfAdjointView.h | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/Eigen/src/Core/util/XprHelper.h b/Eigen/src/Core/util/XprHelper.h index fd2db56a4..f83bca15a 100644 --- a/Eigen/src/Core/util/XprHelper.h +++ b/Eigen/src/Core/util/XprHelper.h @@ -129,7 +129,7 @@ struct promote_index_type template<typename T, int Value> class variable_if_dynamic { public: - EIGEN_EMPTY_STRUCT_CTOR(variable_if_dynamic) + EIGEN_DEFAULT_EMPTY_CONSTRUCTOR_AND_DESTRUCTOR(variable_if_dynamic) EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE explicit variable_if_dynamic(T v) { EIGEN_ONLY_USED_FOR_DEBUG(v); eigen_assert(v == T(Value)); } EIGEN_DEVICE_FUNC static EIGEN_STRONG_INLINE T value() { return T(Value); } EIGEN_DEVICE_FUNC EIGEN_STRONG_INLINE operator T() const { return T(Value); } diff --git a/Eigen/src/SparseCore/SparseSelfAdjointView.h b/Eigen/src/SparseCore/SparseSelfAdjointView.h index 76117a010..85b00e10e 100644 --- a/Eigen/src/SparseCore/SparseSelfAdjointView.h +++ b/Eigen/src/SparseCore/SparseSelfAdjointView.h @@ -142,6 +142,9 @@ template<typename MatrixType, unsigned int _Mode> class SparseSelfAdjointView return *this = src.twistedBy(pnull); } + // Since we override the copy-assignment operator, we need to explicitly re-declare the copy-constructor + EIGEN_DEFAULT_COPY_CONSTRUCTOR(SparseSelfAdjointView) + template<typename SrcMatrixType,unsigned int SrcMode> SparseSelfAdjointView& operator=(const SparseSelfAdjointView<SrcMatrixType,SrcMode>& src) { |