From 832045d363a6edf59d4dc4ad0cfbe02272dcce3c Mon Sep 17 00:00:00 2001 From: Hauke Heibel Date: Mon, 14 Dec 2009 10:32:43 +0100 Subject: Warning 4512 (assignment operators could not be generated) is now simply disabled. All unimplemented assignment operators have been removed. --- Eigen/src/Core/CommaInitializer.h | 3 --- Eigen/src/Core/Cwise.h | 3 --- Eigen/src/Core/Flagged.h | 3 --- Eigen/src/Core/Functors.h | 10 ---------- Eigen/src/Core/NestByValue.h | 3 --- Eigen/src/Core/NoAlias.h | 3 --- Eigen/src/Core/PermutationMatrix.h | 3 --- Eigen/src/Core/Product.h | 6 ------ Eigen/src/Core/ProductBase.h | 2 -- Eigen/src/Core/SelfAdjointView.h | 3 --- Eigen/src/Core/Swap.h | 3 --- Eigen/src/Core/util/DisableMSVCWarnings.h | 3 ++- 12 files changed, 2 insertions(+), 43 deletions(-) (limited to 'Eigen/src/Core') diff --git a/Eigen/src/Core/CommaInitializer.h b/Eigen/src/Core/CommaInitializer.h index 328c5580c..e86f47ad0 100644 --- a/Eigen/src/Core/CommaInitializer.h +++ b/Eigen/src/Core/CommaInitializer.h @@ -116,9 +116,6 @@ struct CommaInitializer int m_row; // current row id int m_col; // current col id int m_currentBlockRows; // current block height - -private: - CommaInitializer& operator=(const CommaInitializer&); }; /** \anchor MatrixBaseCommaInitRef diff --git a/Eigen/src/Core/Cwise.h b/Eigen/src/Core/Cwise.h index 80414782e..4f3d641cb 100644 --- a/Eigen/src/Core/Cwise.h +++ b/Eigen/src/Core/Cwise.h @@ -178,9 +178,6 @@ template class Cwise protected: ExpressionTypeNested m_matrix; - - private: - Cwise& operator=(const Cwise&); }; /** \returns a Cwise wrapper of *this providing additional coefficient-wise operations diff --git a/Eigen/src/Core/Flagged.h b/Eigen/src/Core/Flagged.h index b98861f42..754eaf6c5 100644 --- a/Eigen/src/Core/Flagged.h +++ b/Eigen/src/Core/Flagged.h @@ -111,9 +111,6 @@ template clas protected: ExpressionTypeNested m_matrix; - - private: - Flagged& operator=(const Flagged&); }; /** \deprecated it is only used by lazy() which is deprecated diff --git a/Eigen/src/Core/Functors.h b/Eigen/src/Core/Functors.h index e2a212c89..6b62fb4ea 100644 --- a/Eigen/src/Core/Functors.h +++ b/Eigen/src/Core/Functors.h @@ -351,8 +351,6 @@ struct ei_scalar_multiple_op { EIGEN_STRONG_INLINE const PacketScalar packetOp(const PacketScalar& a) const { return ei_pmul(a, ei_pset1(m_other)); } typename ei_makeconst::Nested>::type m_other; -private: - ei_scalar_multiple_op& operator=(const ei_scalar_multiple_op&); }; template struct ei_functor_traits > @@ -365,8 +363,6 @@ struct ei_scalar_multiple2_op { EIGEN_STRONG_INLINE ei_scalar_multiple2_op(const Scalar2& other) : m_other(other) { } EIGEN_STRONG_INLINE result_type operator() (const Scalar1& a) const { return a * m_other; } typename ei_makeconst::Nested>::type m_other; -private: - ei_scalar_multiple2_op& operator=(ei_scalar_multiple2_op&); }; template struct ei_functor_traits > @@ -382,8 +378,6 @@ struct ei_scalar_quotient1_impl { EIGEN_STRONG_INLINE const PacketScalar packetOp(const PacketScalar& a) const { return ei_pmul(a, ei_pset1(m_other)); } const Scalar m_other; -private: - ei_scalar_quotient1_impl& operator=(const ei_scalar_quotient1_impl&); }; template struct ei_functor_traits > @@ -396,8 +390,6 @@ struct ei_scalar_quotient1_impl { EIGEN_STRONG_INLINE ei_scalar_quotient1_impl(const Scalar& other) : m_other(other) {} EIGEN_STRONG_INLINE Scalar operator() (const Scalar& a) const { return a / m_other; } typename ei_makeconst::Nested>::type m_other; -private: - ei_scalar_quotient1_impl& operator=(const ei_scalar_quotient1_impl&); }; template struct ei_functor_traits > @@ -431,8 +423,6 @@ struct ei_scalar_constant_op { EIGEN_STRONG_INLINE const Scalar operator() (int, int = 0) const { return m_other; } EIGEN_STRONG_INLINE const PacketScalar packetOp() const { return ei_pset1(m_other); } const Scalar m_other; -private: - ei_scalar_constant_op& operator=(const ei_scalar_constant_op&); }; template struct ei_functor_traits > diff --git a/Eigen/src/Core/NestByValue.h b/Eigen/src/Core/NestByValue.h index 94a8f8078..85a672779 100644 --- a/Eigen/src/Core/NestByValue.h +++ b/Eigen/src/Core/NestByValue.h @@ -102,9 +102,6 @@ template class NestByValue protected: const ExpressionType m_expression; - - private: - NestByValue& operator=(const NestByValue&); }; /** \returns an expression of the temporary version of *this. diff --git a/Eigen/src/Core/NoAlias.h b/Eigen/src/Core/NoAlias.h index dc32c2f7b..66d8d834d 100644 --- a/Eigen/src/Core/NoAlias.h +++ b/Eigen/src/Core/NoAlias.h @@ -73,9 +73,6 @@ class NoAlias protected: ExpressionType& m_expression; - - private: - NoAlias& operator=(const NoAlias&); }; /** \returns a pseudo expression of \c *this with an operator= assuming diff --git a/Eigen/src/Core/PermutationMatrix.h b/Eigen/src/Core/PermutationMatrix.h index 4d30b2dac..284baf678 100644 --- a/Eigen/src/Core/PermutationMatrix.h +++ b/Eigen/src/Core/PermutationMatrix.h @@ -320,9 +320,6 @@ struct ei_permut_matrix_product_retval protected: const PermutationType& m_permutation; const typename MatrixType::Nested m_matrix; - - private: - ei_permut_matrix_product_retval& operator=(ei_permut_matrix_product_retval&); }; #endif // EIGEN_PERMUTATIONMATRIX_H diff --git a/Eigen/src/Core/Product.h b/Eigen/src/Core/Product.h index cc751650d..d24ef6159 100644 --- a/Eigen/src/Core/Product.h +++ b/Eigen/src/Core/Product.h @@ -211,9 +211,6 @@ class GeneralProduct { ei_outer_product_selector<(int(Dest::Flags)&RowMajorBit) ? RowMajor : ColMajor>::run(*this, dest, alpha); } - - private: - GeneralProduct& operator=(const GeneralProduct&); }; template<> struct ei_outer_product_selector { @@ -279,9 +276,6 @@ class GeneralProduct ei_gemv_selector::ActualAccess)>::run(*this, dst, alpha); } - -private: - GeneralProduct& operator=(const GeneralProduct&); }; // The vector is on the left => transposition diff --git a/Eigen/src/Core/ProductBase.h b/Eigen/src/Core/ProductBase.h index 955e87feb..33ada4bee 100644 --- a/Eigen/src/Core/ProductBase.h +++ b/Eigen/src/Core/ProductBase.h @@ -129,8 +129,6 @@ class ProductBase : public MatrixBase void coeffRef(int,int); void coeff(int) const; void coeffRef(int); - - ProductBase& operator=(const ProductBase&); }; template diff --git a/Eigen/src/Core/SelfAdjointView.h b/Eigen/src/Core/SelfAdjointView.h index 9518a6498..9b6b3261f 100644 --- a/Eigen/src/Core/SelfAdjointView.h +++ b/Eigen/src/Core/SelfAdjointView.h @@ -151,9 +151,6 @@ template class SelfAdjointView protected: const typename MatrixType::Nested m_matrix; - - private: - SelfAdjointView& operator=(const SelfAdjointView&); }; diff --git a/Eigen/src/Core/Swap.h b/Eigen/src/Core/Swap.h index 45c180983..a7cf219f7 100644 --- a/Eigen/src/Core/Swap.h +++ b/Eigen/src/Core/Swap.h @@ -117,9 +117,6 @@ template class SwapWrapper protected: ExpressionType& m_expression; - - private: - SwapWrapper& operator=(const SwapWrapper&); }; /** swaps *this with the expression \a other. diff --git a/Eigen/src/Core/util/DisableMSVCWarnings.h b/Eigen/src/Core/util/DisableMSVCWarnings.h index 18484e490..c11d582fd 100644 --- a/Eigen/src/Core/util/DisableMSVCWarnings.h +++ b/Eigen/src/Core/util/DisableMSVCWarnings.h @@ -2,7 +2,8 @@ #ifdef _MSC_VER // 4273 - QtAlignedMalloc, inconsistent DLL linkage // 4100 - unreferenced formal parameter (occurred e.g. in aligned_allocator::destroy(pointer p)) - // 4101 - we need this one for the inlining fix + // 4101 - unreferenced local variable + // 4512 - assignment operator could not be generated #pragma warning( push ) #pragma warning( disable : 4100 4101 4181 4244 4127 4211 4273 4522 4717 ) #endif -- cgit v1.2.3