From 3c74d6b7d4598196d9356510a686fb7f929cf04d Mon Sep 17 00:00:00 2001 From: Hauke Heibel Date: Sun, 27 Sep 2009 17:03:02 +0200 Subject: Added private, non-implemented assignment operators to functions that don't need them (fixes VC warning on /W4). --- Eigen/src/Core/CommaInitializer.h | 3 +++ Eigen/src/Core/Cwise.h | 3 +++ Eigen/src/Core/Functors.h | 6 ++++++ Eigen/src/Core/NestByValue.h | 3 +++ Eigen/src/Core/NoAlias.h | 3 +++ Eigen/src/Core/Product.h | 6 ++++++ Eigen/src/Core/ProductBase.h | 2 ++ Eigen/src/Householder/HouseholderSequence.h | 4 +++- 8 files changed, 29 insertions(+), 1 deletion(-) (limited to 'Eigen') diff --git a/Eigen/src/Core/CommaInitializer.h b/Eigen/src/Core/CommaInitializer.h index e86f47ad0..328c5580c 100644 --- a/Eigen/src/Core/CommaInitializer.h +++ b/Eigen/src/Core/CommaInitializer.h @@ -116,6 +116,9 @@ 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 fbf206d9c..4b143325e 100644 --- a/Eigen/src/Core/Cwise.h +++ b/Eigen/src/Core/Cwise.h @@ -178,6 +178,9 @@ 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/Functors.h b/Eigen/src/Core/Functors.h index 0c68d7434..cbaeb83e2 100644 --- a/Eigen/src/Core/Functors.h +++ b/Eigen/src/Core/Functors.h @@ -351,6 +351,8 @@ struct ei_scalar_multiple_op { 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_multiple_op& operator=(const ei_scalar_multiple_op&); }; template struct ei_functor_traits > @@ -378,6 +380,8 @@ 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 > @@ -423,6 +427,8 @@ 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 85a672779..94a8f8078 100644 --- a/Eigen/src/Core/NestByValue.h +++ b/Eigen/src/Core/NestByValue.h @@ -102,6 +102,9 @@ 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 66d8d834d..dc32c2f7b 100644 --- a/Eigen/src/Core/NoAlias.h +++ b/Eigen/src/Core/NoAlias.h @@ -73,6 +73,9 @@ 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/Product.h b/Eigen/src/Core/Product.h index 7f0c2df6e..287fc9c5b 100644 --- a/Eigen/src/Core/Product.h +++ b/Eigen/src/Core/Product.h @@ -211,6 +211,9 @@ 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 { @@ -276,6 +279,9 @@ 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 764dc4d8e..57183ac52 100644 --- a/Eigen/src/Core/ProductBase.h +++ b/Eigen/src/Core/ProductBase.h @@ -137,6 +137,8 @@ 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/Householder/HouseholderSequence.h b/Eigen/src/Householder/HouseholderSequence.h index 16e362814..f5a8dd742 100644 --- a/Eigen/src/Householder/HouseholderSequence.h +++ b/Eigen/src/Householder/HouseholderSequence.h @@ -153,10 +153,12 @@ template class HouseholderSequence } protected: - typename VectorsType::Nested m_vectors; typename CoeffsType::Nested m_coeffs; bool m_trans; + +private: + HouseholderSequence& operator=(const HouseholderSequence&); }; template -- cgit v1.2.3