Some cleanup and renaming.

This commit is contained in:
Benoit Jacob 2007-12-16 12:41:37 +00:00
parent 7c38475291
commit 9314b8e024
15 changed files with 15 additions and 19 deletions

View File

@ -26,7 +26,7 @@
#ifndef EIGEN_CAST_H #ifndef EIGEN_CAST_H
#define EIGEN_CAST_H #define EIGEN_CAST_H
template<typename NewScalar, typename MatrixType> class Cast : NoDefaultOperatorEquals, template<typename NewScalar, typename MatrixType> class Cast : NoOperatorEquals,
public MatrixBase<NewScalar, Cast<NewScalar, MatrixType> > public MatrixBase<NewScalar, Cast<NewScalar, MatrixType> >
{ {
public: public:

View File

@ -26,7 +26,7 @@
#ifndef EIGEN_CONJUGATE_H #ifndef EIGEN_CONJUGATE_H
#define EIGEN_CONJUGATE_H #define EIGEN_CONJUGATE_H
template<typename MatrixType> class Conjugate : NoDefaultOperatorEquals, template<typename MatrixType> class Conjugate : NoOperatorEquals,
public MatrixBase<typename MatrixType::Scalar, Conjugate<MatrixType> > public MatrixBase<typename MatrixType::Scalar, Conjugate<MatrixType> >
{ {
public: public:

View File

@ -27,7 +27,7 @@
#define EIGEN_DIAGONALMATRIX_H #define EIGEN_DIAGONALMATRIX_H
template<typename MatrixType, typename CoeffsVectorType> template<typename MatrixType, typename CoeffsVectorType>
class DiagonalMatrix : NoDefaultOperatorEquals, class DiagonalMatrix : NoOperatorEquals,
public MatrixBase<typename MatrixType::Scalar, public MatrixBase<typename MatrixType::Scalar,
DiagonalMatrix<MatrixType, CoeffsVectorType> > DiagonalMatrix<MatrixType, CoeffsVectorType> >
{ {
@ -48,7 +48,6 @@ class DiagonalMatrix : NoDefaultOperatorEquals,
} }
private: private:
DiagonalMatrix& _ref() { return *this; }
const DiagonalMatrix& _ref() const { return *this; } const DiagonalMatrix& _ref() const { return *this; }
int _rows() const { return m_coeffs.size(); } int _rows() const { return m_coeffs.size(); }
int _cols() const { return m_coeffs.size(); } int _cols() const { return m_coeffs.size(); }

View File

@ -26,7 +26,7 @@
#ifndef EIGEN_DIFFERENCE_H #ifndef EIGEN_DIFFERENCE_H
#define EIGEN_DIFFERENCE_H #define EIGEN_DIFFERENCE_H
template<typename Lhs, typename Rhs> class Difference : NoDefaultOperatorEquals, template<typename Lhs, typename Rhs> class Difference : NoOperatorEquals,
public MatrixBase<typename Lhs::Scalar, Difference<Lhs, Rhs> > public MatrixBase<typename Lhs::Scalar, Difference<Lhs, Rhs> >
{ {
public: public:

View File

@ -26,7 +26,7 @@
#ifndef EIGEN_IDENTITY_H #ifndef EIGEN_IDENTITY_H
#define EIGEN_IDENTITY_H #define EIGEN_IDENTITY_H
template<typename MatrixType> class Identity : NoDefaultOperatorEquals, template<typename MatrixType> class Identity : NoOperatorEquals,
public MatrixBase<typename MatrixType::Scalar, Identity<MatrixType> > public MatrixBase<typename MatrixType::Scalar, Identity<MatrixType> >
{ {
public: public:
@ -42,7 +42,6 @@ template<typename MatrixType> class Identity : NoDefaultOperatorEquals,
} }
private: private:
Identity& _ref() { return *this; }
const Identity& _ref() const { return *this; } const Identity& _ref() const { return *this; }
int _rows() const { return m_rows; } int _rows() const { return m_rows; }
int _cols() const { return m_rows; } int _cols() const { return m_rows; }

View File

@ -44,7 +44,6 @@ template<typename MatrixType> class Map
EIGEN_INHERIT_ASSIGNMENT_OPERATORS(Map) EIGEN_INHERIT_ASSIGNMENT_OPERATORS(Map)
private: private:
Map& _ref() { return *this; }
const Map& _ref() const { return *this; } const Map& _ref() const { return *this; }
int _rows() const { return m_rows; } int _rows() const { return m_rows; }
int _cols() const { return m_cols; } int _cols() const { return m_cols; }

View File

@ -54,7 +54,6 @@ template<typename MatrixType> class Minor
EIGEN_INHERIT_ASSIGNMENT_OPERATORS(Minor) EIGEN_INHERIT_ASSIGNMENT_OPERATORS(Minor)
private: private:
Minor& _ref() { return *this; }
const Minor& _ref() const { return *this; } const Minor& _ref() const { return *this; }
int _rows() const { return m_matrix.rows() - 1; } int _rows() const { return m_matrix.rows() - 1; }
int _cols() const { return m_matrix.cols() - 1; } int _cols() const { return m_matrix.cols() - 1; }

View File

@ -26,7 +26,7 @@
#ifndef EIGEN_ONES_H #ifndef EIGEN_ONES_H
#define EIGEN_ONES_H #define EIGEN_ONES_H
template<typename MatrixType> class Ones : NoDefaultOperatorEquals, template<typename MatrixType> class Ones : NoOperatorEquals,
public MatrixBase<typename MatrixType::Scalar, Ones<MatrixType> > public MatrixBase<typename MatrixType::Scalar, Ones<MatrixType> >
{ {
public: public:

View File

@ -26,7 +26,7 @@
#ifndef EIGEN_OPPOSITE_H #ifndef EIGEN_OPPOSITE_H
#define EIGEN_OPPOSITE_H #define EIGEN_OPPOSITE_H
template<typename MatrixType> class Opposite : NoDefaultOperatorEquals, template<typename MatrixType> class Opposite : NoOperatorEquals,
public MatrixBase<typename MatrixType::Scalar, Opposite<MatrixType> > public MatrixBase<typename MatrixType::Scalar, Opposite<MatrixType> >
{ {
public: public:

View File

@ -60,7 +60,7 @@ struct ProductUnroller<Index, 0, Lhs, Rhs>
static void run(int, int, const Lhs&, const Rhs&, typename Lhs::Scalar&) {} static void run(int, int, const Lhs&, const Rhs&, typename Lhs::Scalar&) {}
}; };
template<typename Lhs, typename Rhs> class Product : NoDefaultOperatorEquals, template<typename Lhs, typename Rhs> class Product : NoOperatorEquals,
public MatrixBase<typename Lhs::Scalar, Product<Lhs, Rhs> > public MatrixBase<typename Lhs::Scalar, Product<Lhs, Rhs> >
{ {
public: public:

View File

@ -26,7 +26,7 @@
#ifndef EIGEN_RANDOM_H #ifndef EIGEN_RANDOM_H
#define EIGEN_RANDOM_H #define EIGEN_RANDOM_H
template<typename MatrixType> class Random : NoDefaultOperatorEquals, template<typename MatrixType> class Random : NoOperatorEquals,
public MatrixBase<typename MatrixType::Scalar, Random<MatrixType> > public MatrixBase<typename MatrixType::Scalar, Random<MatrixType> >
{ {
public: public:

View File

@ -26,7 +26,7 @@
#ifndef EIGEN_SCALARMULTIPLE_H #ifndef EIGEN_SCALARMULTIPLE_H
#define EIGEN_SCALARMULTIPLE_H #define EIGEN_SCALARMULTIPLE_H
template<typename MatrixType> class ScalarMultiple : NoDefaultOperatorEquals, template<typename MatrixType> class ScalarMultiple : NoOperatorEquals,
public MatrixBase<typename MatrixType::Scalar, ScalarMultiple<MatrixType> > public MatrixBase<typename MatrixType::Scalar, ScalarMultiple<MatrixType> >
{ {
public: public:

View File

@ -26,7 +26,7 @@
#ifndef EIGEN_SUM_H #ifndef EIGEN_SUM_H
#define EIGEN_SUM_H #define EIGEN_SUM_H
template<typename Lhs, typename Rhs> class Sum : NoDefaultOperatorEquals, template<typename Lhs, typename Rhs> class Sum : NoOperatorEquals,
public MatrixBase<typename Lhs::Scalar, Sum<Lhs, Rhs> > public MatrixBase<typename Lhs::Scalar, Sum<Lhs, Rhs> >
{ {
public: public:

View File

@ -127,11 +127,11 @@ enum AssertLevel
InternalDebugging = 2 InternalDebugging = 2
}; };
//classes inheriting NoDefaultOperatorEquals don't generate a default operator=. //classes inheriting NoOperatorEquals don't generate a default operator=.
class NoDefaultOperatorEquals class NoOperatorEquals
{ {
private: private:
NoDefaultOperatorEquals& operator=(const NoDefaultOperatorEquals&); NoOperatorEquals& operator=(const NoOperatorEquals&);
}; };
#endif // EIGEN_UTIL_H #endif // EIGEN_UTIL_H

View File

@ -26,7 +26,7 @@
#ifndef EIGEN_ZERO_H #ifndef EIGEN_ZERO_H
#define EIGEN_ZERO_H #define EIGEN_ZERO_H
template<typename MatrixType> class Zero : NoDefaultOperatorEquals, template<typename MatrixType> class Zero : NoOperatorEquals,
public MatrixBase<typename MatrixType::Scalar, Zero<MatrixType> > public MatrixBase<typename MatrixType::Scalar, Zero<MatrixType> >
{ {
public: public: